diff --git a/.env.sample b/.env.sample index 7629c341b228db36cfb8dedfff3461a315f87215..98bebec425a5df7fa973937e8361e27cdf8d5519 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,2 @@ -# TIMEOUT in minutes after which the service will automatically stop, 90 minutes if not set -TIMEOUT= -# Hosts to put down ex `dev.tetras-lab.io`,`reporting.tetras-lab.io` -HOSTS= # Hosts to put down ex `127.0.0.1`,`109.190.86.26` BAN_IPS=`127.0.0.1` diff --git a/ban.sh b/ban.sh index 997bfcf85faca890dbf83c77cbdd0f288208025b..86975fcb84da749e96b1387a4467056e31297df5 100644 --- a/ban.sh +++ b/ban.sh @@ -32,9 +32,6 @@ fi # Chack if is IP validate_ipv4 "$1" if [[ $? -eq 0 ]]; then - domain=$(docker ps -qa | xargs docker inspect | awk '/traefik.http.routers.*.rule/{print $2}' | sed -e 's/^"Host(`//' -e 's/`)",*//' -e 's/`,`/\n/g' | grep -v 'ClientIP' | sort -u | sed "s/^/\`/" | sed "s/$/\`/" | paste -sd ",") - sed -i "s/HOSTS=.*/HOSTS=$domain/" .env - IP="$1" # if BAN_IPS is empt or note diff --git a/docker-compose.yml b/docker-compose.yml index ac186fa6b9894f0479ebb20d09e01edf72a729eb..f7ce09f170fb151fa0ed8b31e9db1a07100d889e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,11 +13,11 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=traefik" - - "traefik.http.routers.maintenance.rule=Host(${HOSTS})&&ClientIP(${BAN_IPS})" - - "traefik.http.routers.maintenance.tls.certresolver=myresolver" - - "traefik.http.routers.maintenance.entrypoints=web,websecure" - - "traefik.http.routers.maintenance.middlewares=hardening@docker" - - "traefik.http.routers.maintenance.priority=99999" + - "traefik.http.routers.ban.rule=ClientIP(${BAN_IPS})" + - "traefik.http.routers.ban.tls.certresolver=myresolver" + - "traefik.http.routers.ban.entrypoints=web,websecure" + - "traefik.http.routers.ban.middlewares=hardening@docker" + - "traefik.http.routers.ban.priority=99999" networks: traefik: