From 00fde508251a69a04e0f877e19a1d2857924f5b5 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 27 Oct 2021 17:13:43 +0200
Subject: [PATCH 01/26] Bot Updating Package Versions

---
 package_versions.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 03ca91c..16bc965 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -133,8 +133,8 @@ php7-ctype-7.4.25-r0
 php7-curl-7.4.25-r0
 php7-dom-7.4.25-r0
 php7-exif-7.4.25-r0
-php7-fileinfo-7.4.24-r0
-php7-fpm-7.4.24-r0
+php7-fileinfo-7.4.25-r0
+php7-fpm-7.4.25-r0
 php7-ftp-7.4.25-r0
 php7-gd-7.4.25-r0
 php7-gmp-7.4.25-r0
@@ -164,7 +164,7 @@ php7-pgsql-7.4.25-r0
 php7-phar-7.4.25-r0
 php7-posix-7.4.25-r0
 php7-session-7.4.25-r0
-php7-simplexml-7.4.24-r0
+php7-simplexml-7.4.25-r0
 php7-soap-7.4.25-r0
 php7-sockets-7.4.25-r0
 php7-sodium-7.4.25-r0
@@ -173,7 +173,7 @@ php7-tokenizer-7.4.25-r0
 php7-xml-7.4.25-r0
 php7-xmlreader-7.4.25-r0
 php7-xmlrpc-7.4.25-r0
-php7-xmlwriter-7.4.24-r0
+php7-xmlwriter-7.4.25-r0
 php7-xsl-7.4.25-r0
 php7-zip-7.4.25-r0
 pinentry-1.1.1-r0
@@ -217,7 +217,7 @@ shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
 sqlite-libs-3.35.5-r0
 ssl_client-1.33.1-r3
-tzdata-2021d-r0
+tzdata-2021e-r0
 unixodbc-2.3.9-r1
 utmps-0.1.0.2-r0
 whois-5.5.10-r0

From 0109a07cfb9e37c44d8bd9251b1713e68dfb33ae Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 11 Nov 2021 06:18:42 +0100
Subject: [PATCH 02/26] 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 08c23bde51a99972370a95e66a838b2e9c759835 Mon Sep 17 00:00:00 2001
From: dongshuzhao <dongshuzhao@baidu.com>
Date: Fri, 12 Nov 2021 16:58:47 +0800
Subject: [PATCH 03/26] Add DnsPod support. resolve linuxserver/docker-swag#98

---
 Dockerfile                        | 1 +
 Dockerfile.aarch64                | 1 +
 Dockerfile.armhf                  | 1 +
 README.md                         | 2 +-
 readme-vars.yml                   | 2 +-
 root/defaults/dns-conf/dnspod.ini | 5 +++++
 root/etc/cont-init.d/50-config    | 4 ++--
 7 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 root/defaults/dns-conf/dnspod.ini

diff --git a/Dockerfile b/Dockerfile
index 07f3b79..085c856 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,6 +108,7 @@ RUN \
     certbot-dns-directadmin \
     certbot-dns-dnsimple \
     certbot-dns-dnsmadeeasy \
+    certbot-dns-dnspod \
     certbot-dns-domeneshop \
     certbot-dns-google \
     certbot-dns-he \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d7d6b95..dacedb4 100755
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -108,6 +108,7 @@ RUN \
     certbot-dns-directadmin \
     certbot-dns-dnsimple \
     certbot-dns-dnsmadeeasy \
+    certbot-dns-dnspod \
     certbot-dns-domeneshop \
     certbot-dns-google \
     certbot-dns-he \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 8993073..6056bd0 100755
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -108,6 +108,7 @@ RUN \
     certbot-dns-directadmin \
     certbot-dns-dnsimple \
     certbot-dns-dnsmadeeasy \
+    certbot-dns-dnspod \
     certbot-dns-domeneshop \
     certbot-dns-google \
     certbot-dns-he \
diff --git a/README.md b/README.md
index 9bb0c10..95d4cb8 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`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `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). |
diff --git a/readme-vars.yml b/readme-vars.yml
index 087cd4d..a4aa67f 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`, `dnspod`, `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)." }
diff --git a/root/defaults/dns-conf/dnspod.ini b/root/defaults/dns-conf/dnspod.ini
new file mode 100644
index 0000000..bd4793b
--- /dev/null
+++ b/root/defaults/dns-conf/dnspod.ini
@@ -0,0 +1,5 @@
+# Instructions: https://github.com/tengattack/certbot-dns-dnspod/blob/master/certbot_dns_dnspod/__init__.py#L20
+# Obtain your own DNSPod API token at DNSPod console: https://console.dnspod.cn/account/token/token
+# Replace with your values
+dns_dnspod_email = me@example.com
+dns_dnspod_api_token = "12345,1234567890abcdef1234567890abcdef"
diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
index 471cf59..1457d55 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|dnspod|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
 
@@ -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|dnspod|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 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 04/26] 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 05/26] 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 06/26] 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 07/26] 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 bf21716886ed41bc56d72f2ddb11ba6b67c2c351 Mon Sep 17 00:00:00 2001
From: dongshuzhao <dongshuzhao@baidu.com>
Date: Sat, 13 Nov 2021 01:04:17 +0800
Subject: [PATCH 08/26] Update dnspod.ini document address resolve
 linuxserver/docker-swag#98

---
 root/defaults/dns-conf/dnspod.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/root/defaults/dns-conf/dnspod.ini b/root/defaults/dns-conf/dnspod.ini
index bd4793b..e5a4630 100644
--- a/root/defaults/dns-conf/dnspod.ini
+++ b/root/defaults/dns-conf/dnspod.ini
@@ -1,5 +1,5 @@
-# Instructions: https://github.com/tengattack/certbot-dns-dnspod/blob/master/certbot_dns_dnspod/__init__.py#L20
+# Instructions: https://github.com/SkyLothar/certbot-dns-dnspod#create-a-credentials-file
 # Obtain your own DNSPod API token at DNSPod console: https://console.dnspod.cn/account/token/token
-# Replace with your values
-dns_dnspod_email = me@example.com
+# Replace with your own email, id and token
+dns_dnspod_email = "me@example.com"
 dns_dnspod_api_token = "12345,1234567890abcdef1234567890abcdef"

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 09/26] Sorted alphabetically.

Co-authored-by: Eric Nemchik <eric@nemchik.com>
---
 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 10/26] Sort alphabetically.

Co-authored-by: Eric Nemchik <eric@nemchik.com>
---
 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 11/26] 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 <ci@linuxserver.io>
Date: Tue, 16 Nov 2021 14:08:24 +0100
Subject: [PATCH 12/26] 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 <ci@linuxserver.io>
Date: Tue, 16 Nov 2021 14:13:21 +0100
Subject: [PATCH 13/26] 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

From 146687121e09a4ca448c4c20ff3a88ebd86d51c5 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 18 Nov 2021 06:18:16 +0100
Subject: [PATCH 14/26] Bot Updating Package Versions

---
 package_versions.txt | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index a92d1f0..73db60e 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -96,26 +96,26 @@ ncurses-libs-6.2_p20210612-r0
 ncurses-terminfo-base-6.2_p20210612-r0
 nettle-3.7.3-r0
 nghttp2-libs-1.43.0-r0
-nginx-1.20.1-r3
-nginx-mod-devel-kit-1.20.1-r3
-nginx-mod-http-brotli-1.20.1-r3
-nginx-mod-http-dav-ext-1.20.1-r3
-nginx-mod-http-echo-1.20.1-r3
-nginx-mod-http-fancyindex-1.20.1-r3
-nginx-mod-http-geoip2-1.20.1-r3
-nginx-mod-http-headers-more-1.20.1-r3
-nginx-mod-http-image-filter-1.20.1-r3
-nginx-mod-http-nchan-1.20.1-r3
-nginx-mod-http-perl-1.20.1-r3
-nginx-mod-http-redis2-1.20.1-r3
-nginx-mod-http-set-misc-1.20.1-r3
-nginx-mod-http-upload-progress-1.20.1-r3
-nginx-mod-http-xslt-filter-1.20.1-r3
-nginx-mod-mail-1.20.1-r3
-nginx-mod-rtmp-1.20.1-r3
-nginx-mod-stream-1.20.1-r3
-nginx-mod-stream-geoip2-1.20.1-r3
-nginx-vim-1.20.1-r3
+nginx-1.20.2-r0
+nginx-mod-devel-kit-1.20.2-r0
+nginx-mod-http-brotli-1.20.2-r0
+nginx-mod-http-dav-ext-1.20.2-r0
+nginx-mod-http-echo-1.20.2-r0
+nginx-mod-http-fancyindex-1.20.2-r0
+nginx-mod-http-geoip2-1.20.2-r0
+nginx-mod-http-headers-more-1.20.2-r0
+nginx-mod-http-image-filter-1.20.2-r0
+nginx-mod-http-nchan-1.20.2-r0
+nginx-mod-http-perl-1.20.2-r0
+nginx-mod-http-redis2-1.20.2-r0
+nginx-mod-http-set-misc-1.20.2-r0
+nginx-mod-http-upload-progress-1.20.2-r0
+nginx-mod-http-xslt-filter-1.20.2-r0
+nginx-mod-mail-1.20.2-r0
+nginx-mod-rtmp-1.20.2-r0
+nginx-mod-stream-1.20.2-r0
+nginx-mod-stream-geoip2-1.20.2-r0
+nginx-vim-1.20.2-r0
 npth-1.6-r0
 oniguruma-6.9.7.1-r0
 openssl-1.1.1l-r0

From 5f526e4f89ed66d3d44151f72d315067ee1f55ec Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Sat, 20 Nov 2021 18:24:46 +0100
Subject: [PATCH 15/26] Bot Updating Templated Files

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5935bd7..5a07515 100644
--- a/README.md
+++ b/README.md
@@ -332,7 +332,8 @@ 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
+* **20.11.21:** - Added support for dnspod validation.
+* **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 df1ba1c60aa0978d7e0863e48291fb36ed5547a0 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Sat, 20 Nov 2021 18:29:59 +0100
Subject: [PATCH 16/26] Bot Updating Package Versions

---
 package_versions.txt | 82 ++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 73db60e..4b1f7ee 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -125,57 +125,57 @@ pcre2-10.36-r0
 perl-5.32.1-r0
 perl-error-0.17029-r1
 perl-git-2.32.0-r0
-php7-7.4.25-r0
-php7-bcmath-7.4.25-r0
-php7-bz2-7.4.25-r0
-php7-common-7.4.25-r0
-php7-ctype-7.4.25-r0
-php7-curl-7.4.25-r0
-php7-dom-7.4.25-r0
-php7-exif-7.4.25-r0
+php7-7.4.26-r0
+php7-bcmath-7.4.26-r0
+php7-bz2-7.4.26-r0
+php7-common-7.4.26-r0
+php7-ctype-7.4.26-r0
+php7-curl-7.4.26-r0
+php7-dom-7.4.26-r0
+php7-exif-7.4.26-r0
 php7-fileinfo-7.4.25-r0
 php7-fpm-7.4.25-r0
-php7-ftp-7.4.25-r0
-php7-gd-7.4.25-r0
-php7-gmp-7.4.25-r0
-php7-iconv-7.4.25-r0
-php7-imap-7.4.25-r0
-php7-intl-7.4.25-r0
-php7-json-7.4.25-r0
-php7-ldap-7.4.25-r0
-php7-mbstring-7.4.25-r0
-php7-mysqli-7.4.25-r0
-php7-mysqlnd-7.4.25-r0
-php7-opcache-7.4.25-r0
-php7-openssl-7.4.25-r0
-php7-pdo-7.4.25-r0
-php7-pdo_mysql-7.4.25-r0
-php7-pdo_odbc-7.4.25-r0
-php7-pdo_pgsql-7.4.25-r0
-php7-pdo_sqlite-7.4.25-r0
-php7-pear-7.4.25-r0
+php7-ftp-7.4.26-r0
+php7-gd-7.4.26-r0
+php7-gmp-7.4.26-r0
+php7-iconv-7.4.26-r0
+php7-imap-7.4.26-r0
+php7-intl-7.4.26-r0
+php7-json-7.4.26-r0
+php7-ldap-7.4.26-r0
+php7-mbstring-7.4.26-r0
+php7-mysqli-7.4.26-r0
+php7-mysqlnd-7.4.26-r0
+php7-opcache-7.4.26-r0
+php7-openssl-7.4.26-r0
+php7-pdo-7.4.26-r0
+php7-pdo_mysql-7.4.26-r0
+php7-pdo_odbc-7.4.26-r0
+php7-pdo_pgsql-7.4.26-r0
+php7-pdo_sqlite-7.4.26-r0
+php7-pear-7.4.26-r0
 php7-pecl-apcu-5.1.21-r0
 php7-pecl-igbinary-3.2.6-r0
 php7-pecl-mailparse-3.1.1-r1
 php7-pecl-mcrypt-1.0.4-r0
 php7-pecl-memcached-3.1.5-r2
 php7-pecl-redis-5.3.4-r0
-php7-pgsql-7.4.25-r0
-php7-phar-7.4.25-r0
-php7-posix-7.4.25-r0
-php7-session-7.4.25-r0
+php7-pgsql-7.4.26-r0
+php7-phar-7.4.26-r0
+php7-posix-7.4.26-r0
+php7-session-7.4.26-r0
 php7-simplexml-7.4.25-r0
-php7-soap-7.4.25-r0
-php7-sockets-7.4.25-r0
-php7-sodium-7.4.25-r0
-php7-sqlite3-7.4.25-r0
-php7-tokenizer-7.4.25-r0
-php7-xml-7.4.25-r0
-php7-xmlreader-7.4.25-r0
-php7-xmlrpc-7.4.25-r0
+php7-soap-7.4.26-r0
+php7-sockets-7.4.26-r0
+php7-sodium-7.4.26-r0
+php7-sqlite3-7.4.26-r0
+php7-tokenizer-7.4.26-r0
+php7-xml-7.4.26-r0
+php7-xmlreader-7.4.26-r0
+php7-xmlrpc-7.4.26-r0
 php7-xmlwriter-7.4.25-r0
-php7-xsl-7.4.25-r0
-php7-zip-7.4.25-r0
+php7-xsl-7.4.26-r0
+php7-zip-7.4.26-r0
 pinentry-1.1.1-r0
 popt-1.18-r0
 procps-3.3.17-r0

From cb5a367323debfdc92f96a1758a9d262d112fe02 Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:39:20 +0100
Subject: [PATCH 17/26] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index c7bd926..ed391bf 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -114,6 +114,7 @@ RUN \
     certbot-dns-google \
     certbot-dns-he \
     certbot-dns-hetzner \
+    certbot-dns-infomaniak \
     certbot-dns-inwx \
     certbot-dns-ionos \
     certbot-dns-linode \

From 0952b6eb3ee95da803af01e9b11e67258bca1acd Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:40:20 +0100
Subject: [PATCH 18/26] Update Dockerfile.aarch64

---
 Dockerfile.aarch64 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 95b6dd0..fd2d529 100755
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -114,6 +114,7 @@ RUN \
     certbot-dns-google \
     certbot-dns-he \
     certbot-dns-hetzner \
+    certbot-dns-infomaniak \
     certbot-dns-inwx \
     certbot-dns-ionos \
     certbot-dns-linode \

From f617df2ba7f1c201769efb8691d59ccadcc0fc8f Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:40:54 +0100
Subject: [PATCH 19/26] Update Dockerfile.armhf

---
 Dockerfile.armhf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 62f3644..a19a60c 100755
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -114,6 +114,7 @@ RUN \
     certbot-dns-google \
     certbot-dns-he \
     certbot-dns-hetzner \
+    certbot-dns-infomaniak \
     certbot-dns-inwx \
     certbot-dns-ionos \
     certbot-dns-linode \

From a001fd849b7deb1c7dd51cb3214cde21fae39ffd Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:42:46 +0100
Subject: [PATCH 20/26] Update readme-vars.yml

---
 readme-vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme-vars.yml b/readme-vars.yml
index 9045829..3d2db89 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`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `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`, `dnspod`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `infomaniak`, `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 2a9294a1db5f926cb0b0b14071ba437f31780818 Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:44:32 +0100
Subject: [PATCH 21/26] Update readme-vars.yml

---
 readme-vars.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme-vars.yml b/readme-vars.yml
index 3d2db89..f2afdac 100755
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { 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." }
   - { 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" }

From 671d51a3459c0c94a7106eab6183ae95cc505cd9 Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:46:55 +0100
Subject: [PATCH 22/26] Create infomaniak.ini

---
 root/defaults/dns-conf/infomaniak.ini | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 root/defaults/dns-conf/infomaniak.ini

diff --git a/root/defaults/dns-conf/infomaniak.ini b/root/defaults/dns-conf/infomaniak.ini
new file mode 100644
index 0000000..99e4482
--- /dev/null
+++ b/root/defaults/dns-conf/infomaniak.ini
@@ -0,0 +1,3 @@
+ Instructions: https://github.com/Infomaniak/certbot-dns-infomaniak#via-ini-file
+# Replace with your values
+certbot_dns_infomaniak:dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

From 6f3a967360a5852cc8921eef7600ba9d672b05fb Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 07:50:31 +0100
Subject: [PATCH 23/26] Update 50-config

---
 root/etc/cont-init.d/50-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
index 7bfe491..84e86ee 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|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|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|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|domeneshop|gandi|gehirn|google|he|hetzner|infomaniak|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
 
@@ -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|desec|dnspod|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
+    elif [[ "$DNSPLUGIN" =~ ^(aliyun|desec|dnspod|domeneshop|he|hetzner|infomaniak|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 96e0fc783839c01c4a3d4ce8cbc1df7da63e1742 Mon Sep 17 00:00:00 2001
From: Questionario <72413125+github-cli@users.noreply.github.com>
Date: Mon, 22 Nov 2021 08:04:05 +0100
Subject: [PATCH 24/26] Update infomaniak.ini

---
 root/defaults/dns-conf/infomaniak.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/defaults/dns-conf/infomaniak.ini b/root/defaults/dns-conf/infomaniak.ini
index 99e4482..039d261 100644
--- a/root/defaults/dns-conf/infomaniak.ini
+++ b/root/defaults/dns-conf/infomaniak.ini
@@ -1,3 +1,3 @@
  Instructions: https://github.com/Infomaniak/certbot-dns-infomaniak#via-ini-file
 # Replace with your values
-certbot_dns_infomaniak:dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

From 3b0095bdec07fff3eb558e8493763d810865441f Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Mon, 22 Nov 2021 13:52:15 +0100
Subject: [PATCH 25/26] Bot Updating Templated Files

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5a07515..3e40c45 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`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `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`, `dnspod`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `infomaniak`, `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
 
+* **22.11.21:** - Added support for Infomaniak DNS for certificate generation.
 * **20.11.21:** - Added support for dnspod validation.
 * **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

From 7b2dab1fbfb761a0c100cefb449b2bbc3ab51447 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 25 Nov 2021 06:18:49 +0100
Subject: [PATCH 26/26] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 4b1f7ee..6e50a3a 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -209,7 +209,7 @@ py3-six-1.15.0-r1
 py3-toml-0.10.2-r2
 py3-urllib3-1.26.5-r0
 py3-webencodings-0.5.1-r4
-python3-3.9.5-r1
+python3-3.9.5-r2
 readline-8.1.0-r0
 s6-ipcserver-2.10.0.3-r0
 scanelf-1.3.2-r0