From 08c23bde51a99972370a95e66a838b2e9c759835 Mon Sep 17 00:00:00 2001 From: dongshuzhao Date: Fri, 12 Nov 2021 16:58:47 +0800 Subject: [PATCH 1/5] 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 bf21716886ed41bc56d72f2ddb11ba6b67c2c351 Mon Sep 17 00:00:00 2001 From: dongshuzhao Date: Sat, 13 Nov 2021 01:04:17 +0800 Subject: [PATCH 2/5] 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 146687121e09a4ca448c4c20ff3a88ebd86d51c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Nov 2021 06:18:16 +0100 Subject: [PATCH 3/5] 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 Date: Sat, 20 Nov 2021 18:24:46 +0100 Subject: [PATCH 4/5] 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 Date: Sat, 20 Nov 2021 18:29:59 +0100 Subject: [PATCH 5/5] 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