Skip to content

Commit 48f6b00

Browse files
aptalcaaptalca
authored
Merge branch 'master' into dnspod-support
2 parents bf21716 + 1466871 commit 48f6b00

File tree

8 files changed

+42
-30
lines changed

8 files changed

+42
-30
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ RUN \
104104
certbot-dns-cloudflare \
105105
certbot-dns-cloudxns \
106106
certbot-dns-cpanel \
107+
certbot-dns-desec \
107108
certbot-dns-digitalocean \
108109
certbot-dns-directadmin \
109110
certbot-dns-dnsimple \
@@ -125,6 +126,7 @@ RUN \
125126
certbot-dns-route53 \
126127
certbot-dns-transip \
127128
certbot-dns-vultr \
129+
certbot-dns-desec \
128130
certbot-plugin-gandi \
129131
cryptography \
130132
requests && \

‎Dockerfile.aarch64‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ RUN \
104104
certbot-dns-cloudflare \
105105
certbot-dns-cloudxns \
106106
certbot-dns-cpanel \
107+
certbot-dns-desec \
107108
certbot-dns-digitalocean \
108109
certbot-dns-directadmin \
109110
certbot-dns-dnsimple \
@@ -125,6 +126,7 @@ RUN \
125126
certbot-dns-route53 \
126127
certbot-dns-transip \
127128
certbot-dns-vultr \
129+
certbot-dns-desec \
128130
certbot-plugin-gandi \
129131
cryptography \
130132
requests && \

‎Dockerfile.armhf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ RUN \
104104
certbot-dns-cloudflare \
105105
certbot-dns-cloudxns \
106106
certbot-dns-cpanel \
107+
certbot-dns-desec \
107108
certbot-dns-digitalocean \
108109
certbot-dns-directadmin \
109110
certbot-dns-dnsimple \

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Container images are configured using parameters passed at runtime (such as thos
213213
| `-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`). |
214214
| `-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) |
215215
| `-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. |
216-
| `-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`. |
216+
| `-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`. |
217217
| `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
218218
| `-e DUCKDNSTOKEN=` | Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org |
219219
| `-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
332332

333333
## Versions
334334

335+
* **15.11.21:** - Added support for deSEC DNS for wildcard certificate generation
335336
* **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
336337
* **23.10.21:** - Fix Hurricane Electric (HE) DNS validation.
337338
* **12.10.21:** - Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking.

‎package_versions.txt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apr-util-1.6.1-r7
77
argon2-libs-20190702-r1
88
bash-5.1.4-r0
99
brotli-libs-1.0.9-r5
10-
busybox-1.33.1-r3
10+
busybox-1.33.1-r6
1111
c-client-2007f-r11
1212
ca-certificates-20191127-r5
1313
ca-certificates-bundle-20191127-r5
@@ -29,7 +29,7 @@ iptables-1.8.7-r1
2929
libacl-2.2.53-r0
3030
libassuan-2.5.5-r0
3131
libattr-2.5.1-r0
32-
libblkid-2.37-r0
32+
libblkid-2.37.2-r0
3333
libbsd-0.11.3-r0
3434
libbz2-1.0.8-r1
3535
libc-utils-0.7.2-r3
@@ -55,10 +55,10 @@ libmcrypt-2.5.8-r9
5555
libmd-1.0.3-r0
5656
libmemcached-libs-1.0.18-r4
5757
libmnl-1.0.4-r1
58-
libmount-2.37-r0
58+
libmount-2.37.2-r0
5959
libnftnl-libs-1.2.0-r0
6060
libpng-1.6.37-r1
61-
libpq-13.4-r0
61+
libpq-13.5-r0
6262
libproc-3.3.17-r0
6363
libressl3.3-libcrypto-3.3.3-r0
6464
libressl3.3-libssl-3.3.3-r0
@@ -72,7 +72,7 @@ libssl1.1-1.1.1l-r0
7272
libstdc++-10.3.1_git20210424-r2
7373
libtasn1-4.17.0-r0
7474
libunistring-0.9.10-r1
75-
libuuid-2.37-r0
75+
libuuid-2.37.2-r0
7676
libwebp-1.2.0-r2
7777
libx11-1.7.2-r0
7878
libxau-1.0.9-r0
@@ -96,26 +96,26 @@ ncurses-libs-6.2_p20210612-r0
9696
ncurses-terminfo-base-6.2_p20210612-r0
9797
nettle-3.7.3-r0
9898
nghttp2-libs-1.43.0-r0
99-
nginx-1.20.1-r3
100-
nginx-mod-devel-kit-1.20.1-r3
101-
nginx-mod-http-brotli-1.20.1-r3
102-
nginx-mod-http-dav-ext-1.20.1-r3
103-
nginx-mod-http-echo-1.20.1-r3
104-
nginx-mod-http-fancyindex-1.20.1-r3
105-
nginx-mod-http-geoip2-1.20.1-r3
106-
nginx-mod-http-headers-more-1.20.1-r3
107-
nginx-mod-http-image-filter-1.20.1-r3
108-
nginx-mod-http-nchan-1.20.1-r3
109-
nginx-mod-http-perl-1.20.1-r3
110-
nginx-mod-http-redis2-1.20.1-r3
111-
nginx-mod-http-set-misc-1.20.1-r3
112-
nginx-mod-http-upload-progress-1.20.1-r3
113-
nginx-mod-http-xslt-filter-1.20.1-r3
114-
nginx-mod-mail-1.20.1-r3
115-
nginx-mod-rtmp-1.20.1-r3
116-
nginx-mod-stream-1.20.1-r3
117-
nginx-mod-stream-geoip2-1.20.1-r3
118-
nginx-vim-1.20.1-r3
99+
nginx-1.20.2-r0
100+
nginx-mod-devel-kit-1.20.2-r0
101+
nginx-mod-http-brotli-1.20.2-r0
102+
nginx-mod-http-dav-ext-1.20.2-r0
103+
nginx-mod-http-echo-1.20.2-r0
104+
nginx-mod-http-fancyindex-1.20.2-r0
105+
nginx-mod-http-geoip2-1.20.2-r0
106+
nginx-mod-http-headers-more-1.20.2-r0
107+
nginx-mod-http-image-filter-1.20.2-r0
108+
nginx-mod-http-nchan-1.20.2-r0
109+
nginx-mod-http-perl-1.20.2-r0
110+
nginx-mod-http-redis2-1.20.2-r0
111+
nginx-mod-http-set-misc-1.20.2-r0
112+
nginx-mod-http-upload-progress-1.20.2-r0
113+
nginx-mod-http-xslt-filter-1.20.2-r0
114+
nginx-mod-mail-1.20.2-r0
115+
nginx-mod-rtmp-1.20.2-r0
116+
nginx-mod-stream-1.20.2-r0
117+
nginx-mod-stream-geoip2-1.20.2-r0
118+
nginx-vim-1.20.2-r0
119119
npth-1.6-r0
120120
oniguruma-6.9.7.1-r0
121121
openssl-1.1.1l-r0
@@ -216,7 +216,7 @@ scanelf-1.3.2-r0
216216
shadow-4.8.1-r0
217217
skalibs-2.10.0.3-r0
218218
sqlite-libs-3.35.5-r0
219-
ssl_client-1.33.1-r3
219+
ssl_client-1.33.1-r6
220220
tzdata-2021e-r0
221221
unixodbc-2.3.9-r1
222222
utmps-0.1.0.2-r0

‎readme-vars.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ opt_param_usage_include_env: true
5151
opt_param_env_vars:
5252
- { 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)" }
5353
- { 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." }
54-
- { 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`." }
54+
- { 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`." }
5555
- { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." }
5656
- { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" }
5757
- { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
@@ -155,6 +155,8 @@ app_setup_nginx_reverse_proxy_block: ""
155155

156156
# changelog
157157
changelogs:
158+
- { date: "20.11.21:", desc: "Added support for dnspod validation." }
159+
- { date: "15.11.21:", desc: "Added support for deSEC DNS for wildcard certificate generation." }
158160
- { 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" }
159161
- { date: "23.10.21:", desc: "Fix Hurricane Electric (HE) DNS validation." }
160162
- { date: "12.10.21:", desc: "Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking." }

‎root/defaults/dns-conf/desec.ini‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Instructions: https://pypi.org/project/certbot-dns-desec/
2+
# Replace with your Desec V1 API Token
3+
dns_desec_token=YOUR_TOKEN_HERE
4+
dns_desec_endpoint=https://desec.io/api/v1/

‎root/etc/cont-init.d/50-config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ if ! grep -q 'PARAMETERS' "/config/nginx/dhparams.pem"; then
122122
fi
123123

124124
# check to make sure DNSPLUGIN is selected if dns validation is used
125-
[[ "$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)$ ]] && \
125+
[[ "$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)$ ]] && \
126126
echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
127127
sleep infinity
128128

@@ -236,7 +236,7 @@ if [ "$VALIDATION" = "dns" ]; then
236236
elif [[ "$DNSPLUGIN" =~ ^(google)$ ]]; then
237237
if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
238238
PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.json ${PROPAGATIONPARAM}"
239-
elif [[ "$DNSPLUGIN" =~ ^(aliyun|dnspod|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
239+
elif [[ "$DNSPLUGIN" =~ ^(aliyun|desec|dnspod|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then
240240
if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
241241
PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}"
242242
elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then

0 commit comments

Comments
 (0)