From 0ce2ae551a8ec1ea21cbbd8a6c8e672901d273da Mon Sep 17 00:00:00 2001 From: Marcel Hofer Date: Sat, 6 Nov 2021 16:07:51 +0100 Subject: [PATCH 1/2] Add support for standalone DNS validation --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + readme-vars.yml | 3 ++- root/defaults/dns-conf/standalone.ini | 8 ++++++++ root/etc/cont-init.d/50-config | 5 ++++- 6 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 root/defaults/dns-conf/standalone.ini diff --git a/Dockerfile b/Dockerfile index 07f3b79..f108bb4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -122,6 +122,7 @@ RUN \ certbot-dns-ovh \ certbot-dns-rfc2136 \ certbot-dns-route53 \ + certbot-dns-standalone \ certbot-dns-transip \ certbot-dns-vultr \ certbot-plugin-gandi \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d7d6b95..6d70001 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -122,6 +122,7 @@ RUN \ certbot-dns-ovh \ certbot-dns-rfc2136 \ certbot-dns-route53 \ + certbot-dns-standalone \ certbot-dns-transip \ certbot-dns-vultr \ certbot-plugin-gandi \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8993073..95e62ab 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -122,6 +122,7 @@ RUN \ certbot-dns-ovh \ certbot-dns-rfc2136 \ certbot-dns-route53 \ + certbot-dns-standalone \ certbot-dns-transip \ certbot-dns-vultr \ certbot-plugin-gandi \ diff --git a/readme-vars.yml b/readme-vars.yml index 087cd4d..fd3a745 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -51,7 +51,7 @@ opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "SUBDOMAINS", env_value: "www,", desc: "Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only)" } - { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." } - - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." } + - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." } - { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." } - { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" } - { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." } @@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "06.11.21:", desc: "Added support for standalone DNS validation." } - { date: "26.10.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf - Mitigate https://httpoxy.org/ vulnerabilities. Ref: https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx#Defeating-the-Attack-using-NGINX-and-NGINX-Plus" } - { date: "23.10.21:", desc: "Fix Hurricane Electric (HE) DNS validation." } - { date: "12.10.21:", desc: "Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking." } diff --git a/root/defaults/dns-conf/standalone.ini b/root/defaults/dns-conf/standalone.ini new file mode 100644 index 0000000..559a8af --- /dev/null +++ b/root/defaults/dns-conf/standalone.ini @@ -0,0 +1,8 @@ +# Instructions: https://github.com/siilike/certbot-dns-standalone/blob/master/README.rst +# Make sure to expose UDP port 53 from your swag container: +# - for docker cli, add argument: `-p 53:53/udp` +# - for docker-compose, add the following line under ports: `- 53:53/udp` +# This file does not need to be changed: +# - no credentials are required +# - it's not used and only for informational purpose +# - prepare the correct DNS records as described in the plugin instructions instead diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 471cf59..5d29905 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -122,7 +122,7 @@ if ! grep -q 'PARAMETERS' "/config/nginx/dhparams.pem"; then fi # check to make sure DNSPLUGIN is selected if dns validation is used -[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \ +[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]] && \ echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \ sleep infinity @@ -239,6 +239,9 @@ if [ "$VALIDATION" = "dns" ]; then elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}" + elif [[ "$DNSPLUGIN" =~ ^(standalone)$ ]]; then + if [ -n "$PROPAGATION" ];then echo "standalone dns plugin does not support setting propagation time"; fi + PREFCHAL="-a dns-${DNSPLUGIN}" elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi PREFCHAL="-a ${DNSPLUGIN} --${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}" From a29f2da10ec3da30d7a3104143ee7cec0a3251c7 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 5 Apr 2022 19:06:43 -0400 Subject: [PATCH 2/2] update changelog date --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 50f957e..d574b83 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,8 +154,8 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "05.04.22:", desc: "Added support for standalone DNS validation." } - { date: "30.11.21:", desc: "Move maxmind to a [new mod](https://github.com/linuxserver/docker-mods/tree/swag-maxmind)" } - - { date: "24.11.21:", desc: "Added support for standalone DNS validation." } - { date: "22.11.21:", desc: "Added support for Infomaniak DNS for certificate generation." } - { date: "20.11.21:", desc: "Added support for dnspod validation." } - { date: "15.11.21:", desc: "Added support for deSEC DNS for wildcard certificate generation." }