diff --git a/Dockerfile b/Dockerfile index 7f5d7d7..e3abefa 100755 --- a/Dockerfile +++ b/Dockerfile @@ -104,14 +104,17 @@ RUN \ certbot-dns-cloudflare \ certbot-dns-cloudxns \ certbot-dns-cpanel \ + certbot-dns-desec \ certbot-dns-digitalocean \ certbot-dns-directadmin \ certbot-dns-dnsimple \ certbot-dns-dnsmadeeasy \ + certbot-dns-dnspod \ certbot-dns-domeneshop \ certbot-dns-google \ certbot-dns-he \ certbot-dns-hetzner \ + certbot-dns-infomaniak \ certbot-dns-inwx \ certbot-dns-ionos \ certbot-dns-linode \ @@ -124,6 +127,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 57e65d6..6d0fbe9 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -104,14 +104,17 @@ RUN \ certbot-dns-cloudflare \ certbot-dns-cloudxns \ certbot-dns-cpanel \ + certbot-dns-desec \ certbot-dns-digitalocean \ certbot-dns-directadmin \ certbot-dns-dnsimple \ certbot-dns-dnsmadeeasy \ + certbot-dns-dnspod \ certbot-dns-domeneshop \ certbot-dns-google \ certbot-dns-he \ certbot-dns-hetzner \ + certbot-dns-infomaniak \ certbot-dns-inwx \ certbot-dns-ionos \ certbot-dns-linode \ @@ -124,6 +127,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 09ed3a0..2871eb3 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -104,14 +104,17 @@ RUN \ certbot-dns-cloudflare \ certbot-dns-cloudxns \ certbot-dns-cpanel \ + certbot-dns-desec \ certbot-dns-digitalocean \ certbot-dns-directadmin \ certbot-dns-dnsimple \ certbot-dns-dnsmadeeasy \ + certbot-dns-dnspod \ certbot-dns-domeneshop \ certbot-dns-google \ certbot-dns-he \ certbot-dns-hetzner \ + certbot-dns-infomaniak \ certbot-dns-inwx \ certbot-dns-ionos \ certbot-dns-linode \ diff --git a/README.md b/README.md index 96fcbc4..caad341 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`, `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). | @@ -333,6 +333,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions * **27.10.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf - Use standard nginx.conf from lsio alpine nginx base image. +* **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 * **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. diff --git a/package_versions.txt b/package_versions.txt index 03ca91c..6e50a3a 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 @@ -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,10 +55,10 @@ 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 +libpq-13.5-r0 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.3-r0 libressl3.3-libssl-3.3.3-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 @@ -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 @@ -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-fileinfo-7.4.24-r0 -php7-fpm-7.4.24-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-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.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-simplexml-7.4.24-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-xmlwriter-7.4.24-r0 -php7-xsl-7.4.25-r0 -php7-zip-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.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.26-r0 +php7-zip-7.4.26-r0 pinentry-1.1.1-r0 popt-1.18-r0 procps-3.3.17-r0 @@ -209,15 +209,15 @@ 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 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 +ssl_client-1.33.1-r6 +tzdata-2021e-r0 unixodbc-2.3.9-r1 utmps-0.1.0.2-r0 whois-5.5.10-r0 diff --git a/readme-vars.yml b/readme-vars.yml index 49d58eb..f70dac3 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`, `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)." } @@ -156,6 +156,9 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: - { date: "27.10.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf - Use standard nginx.conf from lsio alpine nginx base image." } + - { 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" } - { 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/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/defaults/dns-conf/dnspod.ini b/root/defaults/dns-conf/dnspod.ini new file mode 100644 index 0000000..e5a4630 --- /dev/null +++ b/root/defaults/dns-conf/dnspod.ini @@ -0,0 +1,5 @@ +# 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 own email, id and token +dns_dnspod_email = "me@example.com" +dns_dnspod_api_token = "12345,1234567890abcdef1234567890abcdef" diff --git a/root/defaults/dns-conf/infomaniak.ini b/root/defaults/dns-conf/infomaniak.ini new file mode 100644 index 0000000..039d261 --- /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 +dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 8c0b601..4d29100 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -91,7 +91,7 @@ if ! grep -q 'if ($request_uri ~' /config/nginx/authelia-server.conf; 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|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 @@ -205,7 +205,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|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