Djeex/adguard-cidre
1
1
Fork 0
Code Issues Pull Requests Packages Releases 4 Activity

wip-python -> Python rewriting + better logs + backup + update at startup #3

Merged
Djeex merged 6 commits from wip-python into main 2025-05-31 23:22:30 +02:00
Conversation 0 Commits 6 Files Changed 7 +21 -8
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dea060b4d2 - Show all commits

29
update-blocklist.py
View File

@ -51,7 +51,7 @@ def read_manual_ips():
with MANUAL_IPS_FILE.open() as f: with MANUAL_IPS_FILE.open() as f:
for line in f: for line in f:
line = line.strip() line = line.strip()
# Simple regex match for IPv4 or IPv4 CIDR # Simple check for IPv4 or IPv4 CIDR format
if line and line.count('.') == 3: if line and line.count('.') == 3:
valid_ips.append(line) valid_ips.append(line)
logging.info(f"Added {len(valid_ips)} manual IP entries") logging.info(f"Added {len(valid_ips)} manual IP entries")
@ -75,25 +75,36 @@ def update_yaml_with_ips(ips):
output_lines.extend(formatted_ips) output_lines.extend(formatted_ips)
inside_disallowed = True inside_disallowed = True
elif inside_disallowed: elif inside_disallowed:
# Skip old lines under disallowed_clients (assuming indentation) # Skip old lines under disallowed_clients block
if line.startswith(" ") and not line.startswith(" -"): if line.startswith(" ") and not line.startswith(" -"):
# This is a new section, disallowed_clients block ended # New section, disallowed_clients block ended
inside_disallowed = False inside_disallowed = False
output_lines.append(line.rstrip("\n")) output_lines.append(line.rstrip("\n"))
# Else skip line inside disallowed_clients block # else skip line
else: else:
output_lines.append(line.rstrip("\n")) output_lines.append(line.rstrip("\n"))
# If the file ended while still inside disallowed_clients block, append nothing more (already done)
# Write to temporary YAML in same folder (to avoid cross-device rename error)
with TMP_YAML.open("w") as f: with TMP_YAML.open("w") as f:
f.write("\n".join(output_lines) + "\n") f.write("\n".join(output_lines) + "\n")
# Atomic replace
TMP_YAML.replace(ADGUARD_YAML) TMP_YAML.replace(ADGUARD_YAML)
logging.info(f"Updated {ADGUARD_YAML} with new disallowed clients list.") logging.info(f"Updated {ADGUARD_YAML} with new disallowed clients list.")
def restart_adguard_container():
docker_api_url = os.getenv("DOCKER_API_URL", "http://socket-proxy-adguard:2375")
container_name = os.getenv("ADGUARD_CONTAINER_NAME", "adguardhome")
restart_url = f"{docker_api_url}/containers/{container_name}/restart"
logging.info(f"Restarting AdGuard container '{container_name}'...")
try:
resp = requests.post(restart_url, timeout=10)
if resp.status_code == 204:
logging.info("AdGuard container restarted successfully.")
else:
logging.error(f"Failed to restart container: {resp.status_code} {resp.text}")
except Exception as e:
logging.error(f"Error restarting container: {e}")
def main(): def main():
if not ADGUARD_YAML.exists(): if not ADGUARD_YAML.exists():
logging.error(f"{ADGUARD_YAML} not found, exiting.") logging.error(f"{ADGUARD_YAML} not found, exiting.")
@ -113,5 +124,7 @@ def main():
update_yaml_with_ips(combined_ips) update_yaml_with_ips(combined_ips)
restart_adguard_container()
if __name__ == "__main__": if __name__ == "__main__":
main() main()