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

wip - v1 => It's working !! #1

Merged
Djeex merged 9 commits from wip into main 2025-05-31 19:44:49 +02:00
Conversation 0 Commits 9 Files Changed 5 +5 -2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 820020f23e - Show all commits

4
docker-compose.yml
View File

@@ -6,7 +6,8 @@ services:
- TZ=Europe/Paris # change to your timezone - TZ=Europe/Paris # change to your timezone
- BLOCK_COUNTRIES=CN,RU,IR # choose countries listed IP to block. Full lists here https://github.com/vulnebify/cidre/tree/main/output/cidr/ipv4 - BLOCK_COUNTRIES=CN,RU,IR # choose countries listed IP to block. Full lists here https://github.com/vulnebify/cidre/tree/main/output/cidr/ipv4
- BLOCKLIST_CRON=0 6 * * * # at 6:00 every days - BLOCKLIST_CRON=0 6 * * * # at 6:00 every days
- DOCKER_API_URL=http://socket-proxy-adguard:2375 - DOCKER_API_URL=http://socket-proxy-adguard:2375 # docker socket proxy
- ADGUARD_CONTAINER_NAME=adguardhome # adguard container name
volumes: volumes:
- /path/to/adguard/confdir:/adguard - /path/to/adguard/confdir:/adguard
@@ -17,6 +18,7 @@ services:
- no-new-privileges:true - no-new-privileges:true
environment: environment:
- CONTAINERS=1 - CONTAINERS=1
- ALLOW_RESTARTS=1
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
restart: unless-stopped restart: unless-stopped

3
update-blocklist.sh
View File

@@ -8,6 +8,7 @@ MANUAL_IPS_FILE="/adguard/manually_blocked_ips.conf"
CIDR_BASE_URL="https://raw.githubusercontent.com/vulnebify/cidre/main/output/cidr/ipv4" CIDR_BASE_URL="https://raw.githubusercontent.com/vulnebify/cidre/main/output/cidr/ipv4"
COUNTRIES=${BLOCK_COUNTRIES:-""} COUNTRIES=${BLOCK_COUNTRIES:-""}
DOCKER_API_URL=${DOCKER_API_URL:-"http://socket-proxy-adguard:2375"} DOCKER_API_URL=${DOCKER_API_URL:-"http://socket-proxy-adguard:2375"}
ADGUARD_CONTAINER_NAME=${ADGUARD_CONTAINER_NAME:-"adguardhome"}
if [ -z "$COUNTRIES" ]; then if [ -z "$COUNTRIES" ]; then
echo "No countries specified in BLOCK_COUNTRIES." echo "No countries specified in BLOCK_COUNTRIES."
@@ -42,6 +43,6 @@ END { if (inside==1) print ips }
mv "$TMP_YAML" "$ADGUARD_YAML" mv "$TMP_YAML" "$ADGUARD_YAML"
echo "Restarting adguard-home container..." echo "Restarting adguard-home container..."
curl -s -X POST "$DOCKER_API_URL/containers/adguard-home/restart" -o /dev/null curl -s -X POST "$DOCKER_API_URL/containers/$ADGUARD_CONTAINER_NAME/restart" -o /dev/null
echo "Done." echo "Done."