From cb5a367323debfdc92f96a1758a9d262d112fe02 Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:39:20 +0100 Subject: [PATCH 1/9] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c7bd926..ed391bf 100755 --- a/Dockerfile +++ b/Dockerfile @@ -114,6 +114,7 @@ RUN \ certbot-dns-google \ certbot-dns-he \ certbot-dns-hetzner \ + certbot-dns-infomaniak \ certbot-dns-inwx \ certbot-dns-ionos \ certbot-dns-linode \ From 0952b6eb3ee95da803af01e9b11e67258bca1acd Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:40:20 +0100 Subject: [PATCH 2/9] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 95b6dd0..fd2d529 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -114,6 +114,7 @@ RUN \ certbot-dns-google \ certbot-dns-he \ certbot-dns-hetzner \ + certbot-dns-infomaniak \ certbot-dns-inwx \ certbot-dns-ionos \ certbot-dns-linode \ From f617df2ba7f1c201769efb8691d59ccadcc0fc8f Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:40:54 +0100 Subject: [PATCH 3/9] Update Dockerfile.armhf --- Dockerfile.armhf | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 62f3644..a19a60c 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -114,6 +114,7 @@ RUN \ certbot-dns-google \ certbot-dns-he \ certbot-dns-hetzner \ + certbot-dns-infomaniak \ certbot-dns-inwx \ certbot-dns-ionos \ certbot-dns-linode \ From a001fd849b7deb1c7dd51cb3214cde21fae39ffd Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:42:46 +0100 Subject: [PATCH 4/9] Update readme-vars.yml --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 9045829..3d2db89 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`, `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`." } + - { 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)." } From 2a9294a1db5f926cb0b0b14071ba437f31780818 Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:44:32 +0100 Subject: [PATCH 5/9] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 3d2db89..f2afdac 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { 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" } From 671d51a3459c0c94a7106eab6183ae95cc505cd9 Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:46:55 +0100 Subject: [PATCH 6/9] Create infomaniak.ini --- root/defaults/dns-conf/infomaniak.ini | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 root/defaults/dns-conf/infomaniak.ini diff --git a/root/defaults/dns-conf/infomaniak.ini b/root/defaults/dns-conf/infomaniak.ini new file mode 100644 index 0000000..99e4482 --- /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 +certbot_dns_infomaniak:dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX From 6f3a967360a5852cc8921eef7600ba9d672b05fb Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 07:50:31 +0100 Subject: [PATCH 7/9] Update 50-config --- root/etc/cont-init.d/50-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 7bfe491..84e86ee 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|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)$ ]] && \ +[[ "$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 @@ -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|dnspod|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 From 96e0fc783839c01c4a3d4ce8cbc1df7da63e1742 Mon Sep 17 00:00:00 2001 From: Questionario <72413125+github-cli@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:04:05 +0100 Subject: [PATCH 8/9] Update infomaniak.ini --- root/defaults/dns-conf/infomaniak.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/dns-conf/infomaniak.ini b/root/defaults/dns-conf/infomaniak.ini index 99e4482..039d261 100644 --- a/root/defaults/dns-conf/infomaniak.ini +++ b/root/defaults/dns-conf/infomaniak.ini @@ -1,3 +1,3 @@ Instructions: https://github.com/Infomaniak/certbot-dns-infomaniak#via-ini-file # Replace with your values -certbot_dns_infomaniak:dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +dns_infomaniak_token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX From 3b0095bdec07fff3eb558e8493763d810865441f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 22 Nov 2021 13:52:15 +0100 Subject: [PATCH 9/9] Bot Updating Templated Files --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a07515..3e40c45 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`, `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 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). | @@ -332,6 +332,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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