From 0109a07cfb9e37c44d8bd9251b1713e68dfb33ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Nov 2021 06:18:42 +0100 Subject: [PATCH 01/10] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 16bc965..d9295e9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ iptables-1.8.7-r1 libacl-2.2.53-r0 libassuan-2.5.5-r0 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.2-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -55,7 +55,7 @@ libmcrypt-2.5.8-r9 libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.2-r0 libnftnl-libs-1.2.0-r0 libpng-1.6.37-r1 libpq-13.4-r0 @@ -72,7 +72,7 @@ libssl1.1-1.1.1l-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libunistring-0.9.10-r1 -libuuid-2.37-r0 +libuuid-2.37.2-r0 libwebp-1.2.0-r2 libx11-1.7.2-r0 libxau-1.0.9-r0 From 71cda1f685e2939599cac07899da7847a48d05ae Mon Sep 17 00:00:00 2001 From: FarisZR <35614734+fariszr@users.noreply.github.com> Date: Fri, 12 Nov 2021 16:18:15 +0300 Subject: [PATCH 02/10] add desec certbot plugin --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 07f3b79..7e1e4fa 100755 --- a/Dockerfile +++ b/Dockerfile @@ -124,6 +124,7 @@ RUN \ certbot-dns-route53 \ certbot-dns-transip \ certbot-dns-vultr \ + certbot-dns-desec \ certbot-plugin-gandi \ cryptography \ requests && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d7d6b95..36d42b9 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -124,6 +124,7 @@ RUN \ certbot-dns-route53 \ certbot-dns-transip \ certbot-dns-vultr \ + certbot-dns-desec \ certbot-plugin-gandi \ cryptography \ requests && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8993073..54338ce 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -125,6 +125,7 @@ RUN \ certbot-dns-transip \ certbot-dns-vultr \ certbot-plugin-gandi \ + certbot-dns-desec \ cryptography \ requests && \ echo "**** remove unnecessary fail2ban filters ****" && \ From 9b169f5da21e850c187a136faecc3680fa738878 Mon Sep 17 00:00:00 2001 From: FarisZR <35614734+fariszr@users.noreply.github.com> Date: Fri, 12 Nov 2021 16:22:13 +0300 Subject: [PATCH 03/10] add desec config --- root/defaults/dns-conf/desec.ini | 4 ++++ root/etc/cont-init.d/50-config | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 root/defaults/dns-conf/desec.ini diff --git a/root/defaults/dns-conf/desec.ini b/root/defaults/dns-conf/desec.ini new file mode 100644 index 0000000..4ac7a66 --- /dev/null +++ b/root/defaults/dns-conf/desec.ini @@ -0,0 +1,4 @@ +# Instructions: https://pypi.org/project/certbot-dns-desec/ +# Replace with your Desec V1 API Token +dns_desec_token=YOUR_TOKEN_HERE +dns_desec_endpoint=https://desec.io/api/v1/ \ No newline at end of file diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 471cf59..8de7bb7 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|transip|vultr|desec)$ ]] && \ echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \ sleep infinity @@ -236,7 +236,7 @@ if [ "$VALIDATION" = "dns" ]; then elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}" - elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then + elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr|desec)$ ]]; 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" =~ ^(directadmin)$ ]]; then From 637ddc29a545eddf603d0b77860529b8ed4b67b9 Mon Sep 17 00:00:00 2001 From: FarisZR <35614734+fariszr@users.noreply.github.com> Date: Fri, 12 Nov 2021 16:26:57 +0300 Subject: [PATCH 04/10] alphabetical order --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e1e4fa..2ac56d1 100755 --- a/Dockerfile +++ b/Dockerfile @@ -104,6 +104,7 @@ RUN \ certbot-dns-cloudflare \ certbot-dns-cloudxns \ certbot-dns-cpanel \ + certbot-dns-desec \ certbot-dns-digitalocean \ certbot-dns-directadmin \ certbot-dns-dnsimple \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 36d42b9..1f9101f 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -104,6 +104,7 @@ RUN \ certbot-dns-cloudflare \ certbot-dns-cloudxns \ certbot-dns-cpanel \ + certbot-dns-desec \ certbot-dns-digitalocean \ certbot-dns-directadmin \ certbot-dns-dnsimple \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 54338ce..873d8dc 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -104,6 +104,7 @@ RUN \ certbot-dns-cloudflare \ certbot-dns-cloudxns \ certbot-dns-cpanel \ + certbot-dns-desec \ certbot-dns-digitalocean \ certbot-dns-directadmin \ certbot-dns-dnsimple \ @@ -125,7 +126,6 @@ RUN \ certbot-dns-transip \ certbot-dns-vultr \ certbot-plugin-gandi \ - certbot-dns-desec \ cryptography \ requests && \ echo "**** remove unnecessary fail2ban filters ****" && \ From 0d5f7b24b83a5dafc85d4d2b66c300453bc4aae9 Mon Sep 17 00:00:00 2001 From: FarisZR <35614734+fariszr@users.noreply.github.com> Date: Fri, 12 Nov 2021 16:29:14 +0300 Subject: [PATCH 05/10] add desec as an option to readme --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 087cd4d..4aac0a6 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`, `desec`, `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: "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)." } From fee6fe9a17933943f21d82df53ad4f92252cf0fe Mon Sep 17 00:00:00 2001 From: fariszr <35614734+fariszr@users.noreply.github.com> Date: Mon, 15 Nov 2021 19:03:16 +0300 Subject: [PATCH 06/10] Sorted alphabetically. Co-authored-by: Eric Nemchik --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 8de7bb7..dbdab69 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -236,7 +236,7 @@ if [ "$VALIDATION" = "dns" ]; then elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}" - elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr|desec)$ ]]; then + elif [[ "$DNSPLUGIN" =~ ^(aliyun|desec|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" =~ ^(directadmin)$ ]]; then From 8a4af00f01830e21a033c07982fe10611efd7dae Mon Sep 17 00:00:00 2001 From: fariszr <35614734+fariszr@users.noreply.github.com> Date: Mon, 15 Nov 2021 19:03:44 +0300 Subject: [PATCH 07/10] Sort alphabetically. Co-authored-by: Eric Nemchik --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index dbdab69..78bb240 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|desec)$ ]] && \ +[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \ echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \ sleep infinity From 7ea16018d5f443981ec355f45bd5b53042a3868d Mon Sep 17 00:00:00 2001 From: FarisZR <35614734+fariszr@users.noreply.github.com> Date: Mon, 15 Nov 2021 19:10:19 +0300 Subject: [PATCH 08/10] update changelog --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 4aac0a6..fca0b7a 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "15.11.21:", desc: "Added support for deSEC DNS for wildcard certificate generation" } - { 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." } From ce544dd810e09b9e903f253773025273f5efafef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Nov 2021 14:08:24 +0100 Subject: [PATCH 09/10] Bot Updating Templated Files --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bb0c10..4171cae 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e VALIDATION=http` | Certbot validation method to use, options are `http`, `dns` or `duckdns` (`dns` method also requires `DNSPLUGIN` variable set) (`duckdns` method requires `DUCKDNSTOKEN` variable set, and the `SUBDOMAINS` variable must be either empty or set to `wildcard`). | | `-e SUBDOMAINS=www,` | 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) | | `-e CERTPROVIDER=` | 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. | -| `-e DNSPLUGIN=cloudflare` | 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`. | +| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `desec`, `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`. | | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. | | `-e DUCKDNSTOKEN=` | Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org | | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). | @@ -332,6 +332,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.11.21:** - Added support for deSEC DNS for wildcard certificate generation * **26.10.21:** - [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 * **23.10.21:** - Fix Hurricane Electric (HE) DNS validation. * **12.10.21:** - Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking. From 93ba4f18b18509bccb929cfc5471ca42ebcdcca8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Nov 2021 14:13:21 +0100 Subject: [PATCH 10/10] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d9295e9..a92d1f0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ apr-util-1.6.1-r7 argon2-libs-20190702-r1 bash-5.1.4-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r3 +busybox-1.33.1-r6 c-client-2007f-r11 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 @@ -58,7 +58,7 @@ libmnl-1.0.4-r1 libmount-2.37.2-r0 libnftnl-libs-1.2.0-r0 libpng-1.6.37-r1 -libpq-13.4-r0 +libpq-13.5-r0 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.3-r0 libressl3.3-libssl-3.3.3-r0 @@ -216,7 +216,7 @@ scanelf-1.3.2-r0 shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r3 +ssl_client-1.33.1-r6 tzdata-2021e-r0 unixodbc-2.3.9-r1 utmps-0.1.0.2-r0