From 0ddb5be5f52c80153e3cd6b80410efa74f242173 Mon Sep 17 00:00:00 2001 From: Giles Paterson Date: Tue, 30 May 2023 17:04:54 +0100 Subject: [PATCH 1/4] adds dreamhost dns plugin --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + README.md | 3 ++- readme-vars.yml | 3 ++- root/defaults/dns-conf/dreamhost.ini | 4 ++++ root/etc/s6-overlay/s6-rc.d/init-certbot-config/run | 2 +- 6 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 root/defaults/dns-conf/dreamhost.ini diff --git a/Dockerfile b/Dockerfile index 085c146..7b6d59b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -101,6 +101,7 @@ RUN \ certbot-dns-dnspod \ certbot-dns-do \ certbot-dns-domeneshop \ + certbot-dns-dreamhost \ certbot-dns-duckdns \ certbot-dns-dynu \ certbot-dns-gehirn \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index aca81c2..50310c4 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -101,6 +101,7 @@ RUN \ certbot-dns-dnspod \ certbot-dns-do \ certbot-dns-domeneshop \ + certbot-dns-dreamhost \ certbot-dns-duckdns \ certbot-dns-dynu \ certbot-dns-gehirn \ diff --git a/README.md b/README.md index 6933657..4e38c7f 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). | | `-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` 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 `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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`. | +| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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`. | | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. | | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). | | `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` | @@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **31.05.23:** - Added support for dreamhost validation. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **27.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug. * **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik. diff --git a/readme-vars.yml b/readme-vars.yml index a903adc..8fc4f27 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -50,7 +50,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` 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 `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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 `acmedns`, `aliyun`, `azure`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." } - { env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`" } @@ -153,6 +153,7 @@ app_setup_block: | # changelog changelogs: + - { date: "31.05.23:", desc: "Added support for dreamhost validation." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug." } - { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik." } diff --git a/root/defaults/dns-conf/dreamhost.ini b/root/defaults/dns-conf/dreamhost.ini new file mode 100644 index 0000000..ecfec2e --- /dev/null +++ b/root/defaults/dns-conf/dreamhost.ini @@ -0,0 +1,4 @@ +# Instructions: https://github.com/goncalo-leal/certbot-dns-dreamhost#usage +# Replace with your values +dns_dreamhost_baseurl = "https://api.dreamhost.com/" +dns_dreamhost_api_key = "" \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index 3d43f7a..a8c2b66 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -24,7 +24,7 @@ for i in "${SANED_VARS[@]}"; do done # check to make sure DNSPLUGIN is selected if dns validation is used -if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|duckdns|dynu|gandi|gehirn|godaddy|google|google-domains|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then +if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|dreamhost|duckdns|dynu|gandi|gehirn|godaddy|google|google-domains|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." sleep infinity fi From 8dbd50ac06e573f0fae79abc70b3a0b006dacd61 Mon Sep 17 00:00:00 2001 From: Giles Paterson Date: Fri, 28 Jul 2023 10:39:50 +0100 Subject: [PATCH 2/4] Updates changelog date --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 5b2cc12..ab74987 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -153,7 +153,7 @@ app_setup_block: | # changelog changelogs: - - { date: "31.05.23:", desc: "Added support for dreamhost validation." } + - { date: "27.07.23:", desc: "Added support for dreamhost validation." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "27.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug." } - { date: "13.04.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik." } From 33568e1bd3326edde4a2c9c2e7bf4ea06bceb4c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 Jul 2023 11:48:32 +0000 Subject: [PATCH 3/4] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dca4c8f..c5ce54a 100644 --- a/README.md +++ b/README.md @@ -336,7 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **31.05.23:** - Added support for dreamhost validation. +* **27.07.23:** - Added support for dreamhost validation. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **27.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf, authentik-location.conf, authentik-server.conf - Simplify auth configs and fix Set-Cookie header bug. * **13.04.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, authelia-location.conf, authentik-location.conf, and site-confs/default.conf - Move ssl.conf include to default.conf. Remove Authorization headers in authelia. Sort proxy_set_header in authelia and authentik. From 66a86947721b595b62652b3cec1c5890f1067d44 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 Jul 2023 11:52:17 +0000 Subject: [PATCH 4/4] Bot Updating Package Versions --- package_versions.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 488f143..44e3284 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ azure-mgmt-core 1.4.0 python azure-mgmt-dns 8.1.0 python bash 5.2.15-r5 apk beautifulsoup4 4.12.2 python -boto3 1.28.12 python -botocore 1.31.12 python +boto3 1.28.14 python +botocore 1.31.14 python brotli-libs 1.0.9-r14 apk bs4 0.0.1 python busybox 1.36.1 binary @@ -46,6 +46,7 @@ certbot-dns-dnsmadeeasy 2.6.0 python certbot-dns-dnspod 0.1.0 python certbot-dns-do 0.31.0 python certbot-dns-domeneshop 0.2.9 python +certbot-dns-dreamhost 1.0 python certbot-dns-duckdns 1.3 python certbot-dns-dynu 0.0.4 python certbot-dns-gehirn 2.6.0 python @@ -79,7 +80,7 @@ cloudflare 2.11.6 python configobj 5.0.8 python coreutils 9.3-r1 apk cryptography 41.0.2 python -curl 8.1.2-r0 apk +curl 8.2.0-r1 apk dataclasses-json 0.5.13 python distro 1.8.0 python dns-lexicon 3.11.7 python @@ -135,7 +136,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.1-r3 apk -libcurl 8.1.2-r0 apk +libcurl 8.2.0-r1 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk @@ -194,14 +195,14 @@ mock 5.1.0 python mpdecimal 2.5.1-r2 apk msal 1.23.0 python msal-extensions 1.0.0 python -musl 1.2.4-r0 apk +musl 1.2.4-r1 apk musl-utils 1.2.4-r0 apk mypy-extensions 1.0.0 python nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk -nghttp2-libs 1.53.0-r0 apk +nghttp2-libs 1.55.1-r0 apk nginx 1.24.0-r6 apk nginx-mod-devel-kit 1.24.0-r6 apk nginx-mod-http-brotli 1.24.0-r6 apk