From e76d61be0010a9fa20e504c26b12e20a76aa058d Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 19 Nov 2021 22:42:41 +0200 Subject: [PATCH] Add preliminary DigitalOcean DNS support --- .env.sample | 5 +++++ abra.sh | 6 +++--- compose.digitalocean.yml | 15 +++++++++++++++ entrypoint.sh.tmpl | 4 ++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 compose.digitalocean.yml diff --git a/.env.sample b/.env.sample index b524da2..8d57cee 100644 --- a/.env.sample +++ b/.env.sample @@ -46,6 +46,11 @@ COMPOSE_FILE="compose.yml" #GANDI_ENABLED=1 #SECRET_GANDIV5_API_KEY_VERSION=v1 +## DigitalOcean, https://digitalocean.com +#COMPOSE_FILE="$COMPOSE_FILE:compose.digitalocean.yml" +#DIGITALOCEAN_ENABLED=1 +#SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1 + ##################################################################### # Manual wildcard certificate insertion # ##################################################################### diff --git a/abra.sh b/abra.sh index 550ac6b..ea6b88f 100644 --- a/abra.sh +++ b/abra.sh @@ -1,3 +1,3 @@ -export TRAEFIK_YML_VERSION=v19 -export FILE_PROVIDER_YML_VERSION=v9 -export ENTRYPOINT_VERSION=v2 +export TRAEFIK_YML_VERSION=v20 +export FILE_PROVIDER_YML_VERSION=v10 +export ENTRYPOINT_VERSION=v3 diff --git a/compose.digitalocean.yml b/compose.digitalocean.yml new file mode 100644 index 0000000..ebb1cc5 --- /dev/null +++ b/compose.digitalocean.yml @@ -0,0 +1,15 @@ +version: "3.8" + +services: + app: + environment: + - DO_AUTH_TOKEN_FILE=/run/secrets/digitalocean_auth_token + - LETS_ENCRYPT_DNS_CHALLENGE_ENABLED + - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER + secrets: + - digitalocean_auth_token + +secrets: + digitalocean_auth_token: + name: ${STACK_NAME}_digitalocean_auth_token_${SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION} + external: true diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 298d5dc..41cbf44 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -11,4 +11,8 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE") export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE") {{ end }} +{{ if eq (env "DIGITALOCEAN_ENABLED") "1" }} +export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE") +{{ end }} + /entrypoint.sh "$@"