From 68e91b28701587e9fe717a34dc5fdc8496c65df6 Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:45:00 +0100 Subject: [PATCH 1/8] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 41da083..5f74e2f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -108,6 +108,7 @@ RUN \ certbot-dns-linode \ certbot-dns-luadns \ certbot-dns-netcup \ + certbot-dns-njalla\ certbot-dns-nsone \ certbot-dns-ovh \ certbot-dns-rfc2136 \ From 5538ef6736915423f9773d7fe45b9e9185d3bfae Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:45:22 +0100 Subject: [PATCH 2/8] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a1ef5ec..cfc1a83 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -108,6 +108,7 @@ RUN \ certbot-dns-linode \ certbot-dns-luadns \ certbot-dns-netcup \ + certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ certbot-dns-rfc2136 \ From cd57dff76551652376709a1d52a3a738bb57312f Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:45:52 +0100 Subject: [PATCH 3/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5f74e2f..1e2cd68 100755 --- a/Dockerfile +++ b/Dockerfile @@ -108,7 +108,7 @@ RUN \ certbot-dns-linode \ certbot-dns-luadns \ certbot-dns-netcup \ - certbot-dns-njalla\ + certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ certbot-dns-rfc2136 \ From b884e4181eaa998f44ce9ba3a0f0a99836666ab6 Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:46:12 +0100 Subject: [PATCH 4/8] Update Dockerfile.armhf --- Dockerfile.armhf | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4830531..0460d43 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -108,6 +108,7 @@ RUN \ certbot-dns-linode \ certbot-dns-luadns \ certbot-dns-netcup \ + certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ certbot-dns-rfc2136 \ From 1831bbbbcfb65b3fcd9fd0147ae898feb61adefc Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:47:06 +0100 Subject: [PATCH 5/8] 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 f1d925f..0be8589 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -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|netcup|nsone|ovh|rfc2136|route53|transip)$ ]] && \ +[[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|dnsimple|dnsmadeeasy|domeneshop|gandi|google|inwx|linode|luadns|netcup|njalla|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,7 +189,7 @@ 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 + elif [[ "$DNSPLUGIN" =~ ^(netcup|njalla)$ ]]; 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 From 8de14f3790bbf968c68b185bc1a8e0e5c0650e75 Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:09:46 +0100 Subject: [PATCH 6/8] Create njalla.ini --- root/defaults/dns-conf/njalla.ini | 1 + 1 file changed, 1 insertion(+) create mode 100644 root/defaults/dns-conf/njalla.ini diff --git a/root/defaults/dns-conf/njalla.ini b/root/defaults/dns-conf/njalla.ini new file mode 100644 index 0000000..4bc187e --- /dev/null +++ b/root/defaults/dns-conf/njalla.ini @@ -0,0 +1 @@ +dns_njalla_token=0000000000000000000000000000000000000000 From dc55d7796574e0dbdfd0c676a462f17b166fd111 Mon Sep 17 00:00:00 2001 From: netthier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:18:24 +0100 Subject: [PATCH 7/8] Update readme-vars.yml --- readme-vars.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 3caa6f2..ee001c6 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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`, `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: "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`, `njalla`, `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." } @@ -150,6 +150,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "25.11.20:", desc: "Add support for njalla dns validation" } - { 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." } From 1769aad85fd8b4a14c35664fdab175e6522b8da9 Mon Sep 17 00:00:00 2001 From: nett_hier <66856670+netthier@users.noreply.github.com> Date: Wed, 25 Nov 2020 23:27:57 +0100 Subject: [PATCH 8/8] Update njalla.ini --- root/defaults/dns-conf/njalla.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/root/defaults/dns-conf/njalla.ini b/root/defaults/dns-conf/njalla.ini index 4bc187e..4b2a930 100644 --- a/root/defaults/dns-conf/njalla.ini +++ b/root/defaults/dns-conf/njalla.ini @@ -1 +1,2 @@ +# Generate your API token here: https://njal.la/settings/api/ dns_njalla_token=0000000000000000000000000000000000000000