Infra-Mirrors/docker-swag
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-swag.git synced 2024-10-01 01:35:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into standalone-dns-validation

Browse Source
This commit is contained in:
Marcel Hofer 2021-11-20 19:47:43 +01:00 committed by GitHub
commit 85efd12ba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 78 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -109,6 +109,7 @@ RUN \
certbot-dns-directadmin \
certbot-dns-dnsimple \
certbot-dns-dnsmadeeasy \
certbot-dns-dnspod \
certbot-dns-domeneshop \
certbot-dns-google \
certbot-dns-he \

1
Dockerfile.aarch64
View File

@ -109,6 +109,7 @@ RUN \
certbot-dns-directadmin \
certbot-dns-dnsimple \
certbot-dns-dnsmadeeasy \
certbot-dns-dnspod \
certbot-dns-domeneshop \
certbot-dns-google \
certbot-dns-he \

1
Dockerfile.armhf
View File

@ -109,6 +109,7 @@ RUN \
certbot-dns-directadmin \
certbot-dns-dnsimple \
certbot-dns-dnsmadeeasy \
certbot-dns-dnspod \
certbot-dns-domeneshop \
certbot-dns-google \
certbot-dns-he \

5
README.md
View File

@ -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`, `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`, `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,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.

122
package_versions.txt
View File

@ -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-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

7
readme-vars.yml
View File

@ -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`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
- { env_var: "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`, `standalone`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
- { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
- { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" }
- { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
@ -155,8 +155,9 @@ app_setup_nginx_reverse_proxy_block: ""
# changelog
changelogs:
- { date: "16.11.21:", desc: "Added support for standalone DNS validation." }
- { date: "15.11.21:", desc: "Added support for deSEC DNS for wildcard certificate generation" }
- { date: "20.11.21:", desc: "Added support for standalone DNS validation." }
- { 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." }

5
root/defaults/dns-conf/dnspod.ini Normal file
View File

@ -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"

4
root/etc/cont-init.d/50-config
View File

@ -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|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]] && \
[[ "$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|standalone|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|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
elif [[ "$DNSPLUGIN" =~ ^(aliyun|desec|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" =~ ^(standalone)$ ]]; then