From ead19915f3dc04c77cb64d44d2ddc0d9b823e1a3 Mon Sep 17 00:00:00 2001 From: ijaron Date: Fri, 12 Mar 2021 14:24:56 -0600 Subject: [PATCH 1/3] Add ACME-DNS certbot plugin uses https://github.com/pan-net-security/certbot-dns-acmedns in to implement ACME-DNS support. Requires file in /data with following layout # cat /data/acme-registration.json { "something.acme.com": { "username": "6e14735c-2c6a-447e-b63d-a23ac4438bd7", "password": "dd6gnYS-IxrQfDLbdPRX3hrFhS_SLrwbS0kSl_i8", "fulldomain": "3b750a0e-c627-423f-9966-4799c6a9533b.auth.example.org", "subdomain": "3b750a0e-c627-423f-9966-4799c6a9533b", "allowfrom": [] } } --- global/certbot-dns-plugins.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index b055f84..bd8f778 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -302,4 +302,14 @@ dns_eurodns_apiKey = mysecretpassword dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`, full_plugin_name: 'certbot-dns-eurodns:dns-eurodns', }, + //####################################################// + acmedns: { + display_name: 'ACME-DNS', + package_name: 'certbot-dns-acmedns', + package_version: '0.1.0', + dependencies: '', + credentials: `certbot_dns_acmedns:dns_acmedns_api_url = http://acmedns-server/ +certbot_dns_acmedns:dns_acmedns_registration_file = /data/acme-registration.json`, + full_plugin_name: 'certbot-dns-acmedns:dns-acmedns', + }, }; From f29ff15167baf04ee0ef449031e73af7da641e5b Mon Sep 17 00:00:00 2001 From: Gurjinder Singh Date: Sun, 14 Mar 2021 05:13:26 -0400 Subject: [PATCH 2/3] Update README.md found it in config file was going to add option # Custom include /data/nginx/custom/http_top[.]conf; https://github.com/jc21/nginx-proxy-manager/blob/b7b808d98d787b25548265055d9f8621d31b580e/docker/rootfs/etc/nginx/nginx.conf#L72 --- docs/advanced-config/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/advanced-config/README.md b/docs/advanced-config/README.md index ebd9734..49df73e 100644 --- a/docs/advanced-config/README.md +++ b/docs/advanced-config/README.md @@ -132,6 +132,7 @@ NPM has the ability to include different custom configuration snippets in differ You can add your custom configuration snippet files at `/data/nginx/custom` as follow: - `/data/nginx/custom/root.conf`: Included at the very end of nginx.conf + - `/data/nginx/custom/http_top.conf`: Included at the top of the main http block - `/data/nginx/custom/http.conf`: Included at the end of the main http block - `/data/nginx/custom/stream.conf`: Included at the end of the main stream block - `/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy server block From e2e31094aab872cfcbac977a2f5d8ef4ada7fee3 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 16 Mar 2021 11:32:38 +1000 Subject: [PATCH 3/3] Fix CI, no var needed for this --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74dc0a1..39606e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -222,7 +222,7 @@ pipeline { always { sh 'docker-compose down --rmi all --remove-orphans --volumes -t 30' sh 'echo Reverting ownership' - sh 'docker run --rm -v $(pwd):/data ${DOCKER_CI_TOOLS} chown -R $(id -u):$(id -g) /data' + sh 'docker run --rm -v $(pwd):/data jc21/ci-tools chown -R $(id -u):$(id -g) /data' } success { juxtapose event: 'success'