mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-06 02:13:35 +09:00
Compare commits
15 Commits
1.9.0-ls19
...
1.9.0-ls21
| Author | SHA1 | Date | |
|---|---|---|---|
|
04745dcf1f | ||
|
|
0a4cac7f35 | ||
|
95e7ef9db3 | ||
|
515addf76e | ||
|
|
046fb5447a | ||
|
|
f23595d0b9 | ||
|
812f2d3df5 | ||
|
|
71734a4e49 | ||
|
|
4d9439c899 | ||
|
|
a910da2633 | ||
|
|
35fa03e01c | ||
|
|
9de23713ca | ||
|
|
3e3dccd836 | ||
|
1d08b6f2e1 | ||
|
|
01dd12f567 |
@@ -107,6 +107,7 @@ RUN \
|
||||
certbot-dns-inwx \
|
||||
certbot-dns-linode \
|
||||
certbot-dns-luadns \
|
||||
certbot-dns-netcup \
|
||||
certbot-dns-nsone \
|
||||
certbot-dns-ovh \
|
||||
certbot-dns-rfc2136 \
|
||||
|
||||
@@ -107,6 +107,7 @@ RUN \
|
||||
certbot-dns-inwx \
|
||||
certbot-dns-linode \
|
||||
certbot-dns-luadns \
|
||||
certbot-dns-netcup \
|
||||
certbot-dns-nsone \
|
||||
certbot-dns-ovh \
|
||||
certbot-dns-rfc2136 \
|
||||
|
||||
@@ -107,6 +107,7 @@ RUN \
|
||||
certbot-dns-inwx \
|
||||
certbot-dns-linode \
|
||||
certbot-dns-luadns \
|
||||
certbot-dns-netcup \
|
||||
certbot-dns-nsone \
|
||||
certbot-dns-ovh \
|
||||
certbot-dns-rfc2136 \
|
||||
|
||||
@@ -139,7 +139,7 @@ Container images are configured using parameters passed at runtime (such as thos
|
||||
| `-e URL=yourdomain.url` | Top url you have control over (`customdomain.com` if you own it, or `customsubdomain.ddnsprovider.com` if dynamic dns). |
|
||||
| `-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 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 DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `google`, `inwx`, `linode`, `luadns`, `nsone`, `ovh`, `rfc2136`, `route53` and `transip`. 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`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `google`, `inwx`, `linode`, `luadns`, `netcup`, `nsone`, `ovh`, `rfc2136`, `route53` and `transip`. 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. |
|
||||
@@ -322,6 +322,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **01.11.20:** - Add support for netcup dns validation
|
||||
* **29.10.20:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) ssl.conf - Add frame-ancestors to Content-Security-Policy.
|
||||
* **04.10.20:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, proxy.conf, and ssl.conf - Minor cleanups and reordering.
|
||||
* **20.09.20:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf - Added geoip2 configs. Added MAXMINDDB_LICENSE_KEY variable to readme.
|
||||
* **08.09.20:** - Add php7-xsl.
|
||||
|
||||
@@ -123,55 +123,55 @@ pcre2-10.35-r0
|
||||
perl-5.30.3-r0
|
||||
perl-error-0.17029-r0
|
||||
perl-git-2.26.2-r0
|
||||
php7-7.3.23-r0
|
||||
php7-bcmath-7.3.23-r0
|
||||
php7-bz2-7.3.23-r0
|
||||
php7-common-7.3.23-r0
|
||||
php7-ctype-7.3.23-r0
|
||||
php7-curl-7.3.23-r0
|
||||
php7-dom-7.3.23-r0
|
||||
php7-exif-7.3.23-r0
|
||||
php7-fileinfo-7.3.23-r0
|
||||
php7-fpm-7.3.23-r0
|
||||
php7-ftp-7.3.23-r0
|
||||
php7-gd-7.3.23-r0
|
||||
php7-iconv-7.3.23-r0
|
||||
php7-imap-7.3.23-r0
|
||||
php7-intl-7.3.23-r0
|
||||
php7-json-7.3.23-r0
|
||||
php7-ldap-7.3.23-r0
|
||||
php7-mbstring-7.3.23-r0
|
||||
php7-mysqli-7.3.23-r0
|
||||
php7-mysqlnd-7.3.23-r0
|
||||
php7-opcache-7.3.23-r0
|
||||
php7-openssl-7.3.23-r0
|
||||
php7-pdo-7.3.23-r0
|
||||
php7-pdo_mysql-7.3.23-r0
|
||||
php7-pdo_odbc-7.3.23-r0
|
||||
php7-pdo_pgsql-7.3.23-r0
|
||||
php7-pdo_sqlite-7.3.23-r0
|
||||
php7-pear-7.3.23-r0
|
||||
php7-7.3.24-r0
|
||||
php7-bcmath-7.3.24-r0
|
||||
php7-bz2-7.3.24-r0
|
||||
php7-common-7.3.24-r0
|
||||
php7-ctype-7.3.24-r0
|
||||
php7-curl-7.3.24-r0
|
||||
php7-dom-7.3.24-r0
|
||||
php7-exif-7.3.24-r0
|
||||
php7-fileinfo-7.3.24-r0
|
||||
php7-fpm-7.3.24-r0
|
||||
php7-ftp-7.3.24-r0
|
||||
php7-gd-7.3.24-r0
|
||||
php7-iconv-7.3.24-r0
|
||||
php7-imap-7.3.24-r0
|
||||
php7-intl-7.3.24-r0
|
||||
php7-json-7.3.24-r0
|
||||
php7-ldap-7.3.24-r0
|
||||
php7-mbstring-7.3.24-r0
|
||||
php7-mysqli-7.3.24-r0
|
||||
php7-mysqlnd-7.3.24-r0
|
||||
php7-opcache-7.3.24-r0
|
||||
php7-openssl-7.3.24-r0
|
||||
php7-pdo-7.3.24-r0
|
||||
php7-pdo_mysql-7.3.24-r0
|
||||
php7-pdo_odbc-7.3.24-r0
|
||||
php7-pdo_pgsql-7.3.24-r0
|
||||
php7-pdo_sqlite-7.3.24-r0
|
||||
php7-pear-7.3.24-r0
|
||||
php7-pecl-apcu-5.1.19-r0
|
||||
php7-pecl-igbinary-3.1.6-r0
|
||||
php7-pecl-mcrypt-1.0.3-r0
|
||||
php7-pecl-memcached-3.1.5-r0
|
||||
php7-pecl-redis-5.2.2-r1
|
||||
php7-pgsql-7.3.23-r0
|
||||
php7-phar-7.3.23-r0
|
||||
php7-posix-7.3.23-r0
|
||||
php7-session-7.3.23-r0
|
||||
php7-simplexml-7.3.23-r0
|
||||
php7-soap-7.3.23-r0
|
||||
php7-sockets-7.3.23-r0
|
||||
php7-sodium-7.3.23-r0
|
||||
php7-sqlite3-7.3.23-r0
|
||||
php7-tokenizer-7.3.23-r0
|
||||
php7-xml-7.3.23-r0
|
||||
php7-xmlreader-7.3.23-r0
|
||||
php7-xmlrpc-7.3.23-r0
|
||||
php7-xmlwriter-7.3.23-r0
|
||||
php7-xsl-7.3.23-r0
|
||||
php7-zip-7.3.23-r0
|
||||
php7-pgsql-7.3.24-r0
|
||||
php7-phar-7.3.24-r0
|
||||
php7-posix-7.3.24-r0
|
||||
php7-session-7.3.24-r0
|
||||
php7-simplexml-7.3.24-r0
|
||||
php7-soap-7.3.24-r0
|
||||
php7-sockets-7.3.24-r0
|
||||
php7-sodium-7.3.24-r0
|
||||
php7-sqlite3-7.3.24-r0
|
||||
php7-tokenizer-7.3.24-r0
|
||||
php7-xml-7.3.24-r0
|
||||
php7-xmlreader-7.3.24-r0
|
||||
php7-xmlrpc-7.3.24-r0
|
||||
php7-xmlwriter-7.3.24-r0
|
||||
php7-xsl-7.3.24-r0
|
||||
php7-zip-7.3.24-r0
|
||||
pinentry-1.1.0-r2
|
||||
popt-1.16-r7
|
||||
procps-3.3.16-r0
|
||||
|
||||
@@ -50,7 +50,7 @@ cap_add_param_vars:
|
||||
# optional container parameters
|
||||
opt_param_usage_include_env: true
|
||||
opt_param_env_vars:
|
||||
- { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `google`, `inwx`, `linode`, `luadns`, `nsone`, `ovh`, `rfc2136`, `route53` and `transip`. 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`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `google`, `inwx`, `linode`, `luadns`, `netcup`, `nsone`, `ovh`, `rfc2136`, `route53` and `transip`. 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." }
|
||||
@@ -149,6 +149,8 @@ app_setup_nginx_reverse_proxy_block: ""
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "01.11.20:", desc: "Add support for netcup dns validation" }
|
||||
- { date: "29.10.20:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) ssl.conf - Add frame-ancestors to Content-Security-Policy." }
|
||||
- { date: "04.10.20:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, proxy.conf, and ssl.conf - Minor cleanups and reordering." }
|
||||
- { date: "20.09.20:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf - Added geoip2 configs. Added MAXMINDDB_LICENSE_KEY variable to readme."}
|
||||
- { date: "08.09.20:", desc: "Add php7-xsl." }
|
||||
|
||||
3
root/defaults/dns-conf/netcup.ini
Normal file
3
root/defaults/dns-conf/netcup.ini
Normal file
@@ -0,0 +1,3 @@
|
||||
dns_netcup_customer_id = 123456
|
||||
dns_netcup_api_key = 0123456789abcdef0123456789abcdef01234567
|
||||
dns_netcup_api_password = abcdef0123456789abcdef01234567abcdef0123
|
||||
@@ -1,4 +1,4 @@
|
||||
## Version 2020/10/04 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/ssl.conf
|
||||
## Version 2020/10/29 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/ssl.conf
|
||||
|
||||
### Mozilla Recommendations
|
||||
# generated 2020-06-17, Mozilla Guideline v5.4, nginx 1.18.0-r0, OpenSSL 1.1.1g-r0, intermediate configuration
|
||||
@@ -40,7 +40,7 @@ ssl_early_data on;
|
||||
|
||||
# Optional additional headers
|
||||
#add_header Cache-Control "no-transform" always;
|
||||
#add_header Content-Security-Policy "upgrade-insecure-requests";
|
||||
#add_header Content-Security-Policy "upgrade-insecure-requests; frame-ancestors 'self'";
|
||||
#add_header Referrer-Policy "same-origin" always;
|
||||
#add_header X-Content-Type-Options "nosniff" always;
|
||||
#add_header X-Frame-Options "SAMEORIGIN" always;
|
||||
|
||||
@@ -92,7 +92,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|dnsimple|dnsmadeeasy|domeneshop|gandi|google|inwx|linode|luadns|nsone|ovh|rfc2136|route53|transip)$ ]] && \
|
||||
[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|dnsimple|dnsmadeeasy|domeneshop|gandi|google|inwx|linode|luadns|netcup|nsone|ovh|rfc2136|route53|transip)$ ]] && \
|
||||
echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \
|
||||
sleep infinity
|
||||
|
||||
@@ -189,6 +189,9 @@ if [ "$VALIDATION" = "dns" ]; then
|
||||
elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|inwx|transip)$ ]]; then
|
||||
if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--certbot-dns-${DNSPLUGIN}:dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
|
||||
PREFCHAL="-a certbot-dns-${DNSPLUGIN}:dns-${DNSPLUGIN} --certbot-dns-${DNSPLUGIN}:dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM} --manual-public-ip-logging-ok"
|
||||
elif [[ "$DNSPLUGIN" =~ ^(netcup)$ ]]; 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} --manual-public-ip-logging-ok"
|
||||
else
|
||||
if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi
|
||||
PREFCHAL="--dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM} --manual-public-ip-logging-ok"
|
||||
|
||||
Reference in New Issue
Block a user