diff --git a/server-scripts/desec-ip-sync/Dockerfile b/server-scripts/desec-ip-sync/Dockerfile index ae7c9ed..028154c 100644 --- a/server-scripts/desec-ip-sync/Dockerfile +++ b/server-scripts/desec-ip-sync/Dockerfile @@ -4,7 +4,6 @@ COPY . /desec WORKDIR /desec/server-scripts/desec-ip-sync/ - RUN apt update && apt install python3.11-venv -y CMD ["bash", "run.bash"] diff --git a/server-scripts/desec-ip-sync/docker-compose.yml b/server-scripts/desec-ip-sync/docker-compose.yml index fcb49d0..735b171 100644 --- a/server-scripts/desec-ip-sync/docker-compose.yml +++ b/server-scripts/desec-ip-sync/docker-compose.yml @@ -1,4 +1,8 @@ services: - desec-script: - image: git.devdoes.work/devaine/desec-script:latest - container_name: desec-script + desec: + container_name: desec + image: git.devdoes.work/devaine/scripts:desec + platform: "linux/arm64" + environment: + - DESEC_TOKEN=${DESEC_TOKEN} + - CURRENT_DOMAIN=${CURRENT_DOMAIN} diff --git a/server-scripts/desec-ip-sync/main.py b/server-scripts/desec-ip-sync/main.py index 6e68023..c977e7a 100755 --- a/server-scripts/desec-ip-sync/main.py +++ b/server-scripts/desec-ip-sync/main.py @@ -11,7 +11,7 @@ load_dotenv() DOMAIN = os.getenv("CURRENT_DOMAIN") DESEC_TOKEN = os.getenv("DESEC_TOKEN") IGNORED_SUBDOMAINS_PREFIXES = ["mail._domainkey.mail", "mail", "_dmarc.mail", "skyguy"] -TIMEOUT = 10 # In seconds, 600 = 10min, 900 = 15m, 1800 = 30min +TIMEOUT = 1800 # In seconds, 600 = 10min, 900 = 15m, 1800 = 30min # Credits: # https://desec.readthedocs.io/en/latest/dns/rrsets.html#modifying-an-rrset diff --git a/server-scripts/desec-ip-sync/run.bash b/server-scripts/desec-ip-sync/run.bash index 934c33f..b7caa23 100755 --- a/server-scripts/desec-ip-sync/run.bash +++ b/server-scripts/desec-ip-sync/run.bash @@ -1,5 +1,10 @@ #!/bin/bash +if [ ! -f .env ]; then + env | grep DESEC_TOKEN >>.env + env | grep CURRENT_DOMAIN >>.env +fi + # If virtual environment does exist.. if [ ! -d venv ]; then python3 -m venv venv