From c78f641e85a300f86e86bb5d96baf75c5d095827 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 11 Jan 2022 08:54:40 +1000 Subject: [PATCH 01/10] Revert #1614 as it breaks some existing services --- docker/rootfs/etc/nginx/conf.d/include/proxy.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf index e2cb451..fcaaf00 100644 --- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf +++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf @@ -2,8 +2,6 @@ add_header X-Served-By $host; proxy_set_header Host $host; proxy_set_header X-Forwarded-Scheme $scheme; proxy_set_header X-Forwarded-Proto $scheme; -proxy_set_header X-Forwarded-Host $host; -proxy_set_header X-Forwarded-Port $port; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Real-IP $remote_addr; proxy_pass $forward_scheme://$server:$port$request_uri; From 818b9595aa197020e9ee02fa5a6722ef60e02e6a Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 11 Jan 2022 08:57:24 +1000 Subject: [PATCH 02/10] Use renamed nginx-full docker images --- docker/Dockerfile | 2 +- docker/dev/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0097691..a976ade 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ # This file assumes that the frontend has been built using ./scripts/frontend-build -FROM nginxproxymanager/nginx-full:node +FROM nginxproxymanager/nginx-full:certbot-node ARG TARGETPLATFORM ARG BUILD_VERSION diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 0baf7f3..d2e2266 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM nginxproxymanager/nginx-full:node +FROM nginxproxymanager/nginx-full:certbot-node LABEL maintainer="Jamie Curnow " ENV S6_LOGGING=0 \ From 5fb0cc5faba0c44eb6e17ef9ad6103fbd15c6c3b Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 11 Jan 2022 11:17:19 +1000 Subject: [PATCH 03/10] No need to symlink python, done in base image now --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 860c88d..1b74469 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,14 +62,14 @@ pipeline { stage('Backend') { steps { echo 'Checking Syntax ...' - sh 'docker pull node:latest' + sh 'docker pull nginxproxymanager/nginx-full:certbot-node' // See: https://github.com/yarnpkg/yarn/issues/3254 sh '''docker run --rm \\ -v "$(pwd)/backend:/app" \\ -v "$(pwd)/global:/app/global" \\ -w /app \\ - node:latest \\ - sh -c "ln -s /usr/bin/python3 /usr/bin/python && yarn install && yarn eslint . && rm -rf node_modules" + nginxproxymanager/nginx-full:certbot-node \\ + sh -c "yarn install && yarn eslint . && rm -rf node_modules" ''' echo 'Docker Build ...' From 5bd002a5688a90e76188037c6a5000984b1361a6 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 11 Jan 2022 11:28:01 +1000 Subject: [PATCH 04/10] Forgot to update this docker base image --- scripts/frontend-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/frontend-build b/scripts/frontend-build index 162502c..8bfbbcf 100755 --- a/scripts/frontend-build +++ b/scripts/frontend-build @@ -3,7 +3,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . "$DIR/.common.sh" -DOCKER_IMAGE=jc21/nginx-full:node +DOCKER_IMAGE=jc21/nginx-full:certbot-node # Ensure docker exists if hash docker 2>/dev/null; then From 1f3ac7a9ec80ec49a1c13ebcc46ab3f48ae026f4 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 11 Jan 2022 11:52:25 +1000 Subject: [PATCH 05/10] And update the docker org too --- scripts/frontend-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/frontend-build b/scripts/frontend-build index 8bfbbcf..0e12cf0 100755 --- a/scripts/frontend-build +++ b/scripts/frontend-build @@ -3,7 +3,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . "$DIR/.common.sh" -DOCKER_IMAGE=jc21/nginx-full:certbot-node +DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node # Ensure docker exists if hash docker 2>/dev/null; then From fa7df05b9269cd5daeb772fc502fd3e7b392486e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 23:02:03 +0000 Subject: [PATCH 06/10] Bump markdown-it from 11.0.0 to 12.3.2 in /docs Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 11.0.0 to 12.3.2. - [Release notes](https://github.com/markdown-it/markdown-it/releases) - [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md) - [Commits](https://github.com/markdown-it/markdown-it/compare/11.0.0...12.3.2) --- updated-dependencies: - dependency-name: markdown-it dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- docs/yarn.lock | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/package.json b/docs/package.json index ae416aa..75d7446 100644 --- a/docs/package.json +++ b/docs/package.json @@ -394,7 +394,7 @@ "map-age-cleaner": "^0.1.3", "map-cache": "^0.2.2", "map-visit": "^1.0.0", - "markdown-it": "^11.0.0", + "markdown-it": "^12.3.2", "markdown-it-anchor": "^5.3.0", "markdown-it-chain": "^1.3.0", "markdown-it-container": "^3.0.0", diff --git a/docs/yarn.lock b/docs/yarn.lock index f3fc8b0..adde0c5 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -1686,6 +1686,11 @@ argparse@^1.0.10, argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -3744,10 +3749,10 @@ entities@^1.1.1, entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== -entities@^2.0.0, entities@^2.0.3, entities@~2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" - integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ== +entities@^2.0.0, entities@^2.0.3, entities@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== envify@^4.0.0, envify@^4.1.0: version "4.1.0" @@ -6135,13 +6140,13 @@ markdown-it-table-of-contents@^0.4.0, markdown-it-table-of-contents@^0.4.4: resolved "https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz#3dc7ce8b8fc17e5981c77cc398d1782319f37fbc" integrity sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw== -markdown-it@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz#dbfc30363e43d756ebc52c38586b91b90046b876" - integrity sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg== +markdown-it@^12.3.2: + version "12.3.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" + integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== dependencies: - argparse "^1.0.7" - entities "~2.0.0" + argparse "^2.0.1" + entities "~2.1.0" linkify-it "^3.0.1" mdurl "^1.0.1" uc.micro "^1.0.5" From f235ec8b5a36167ad42d0c455033ab420ec48764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 05:54:23 +0000 Subject: [PATCH 07/10] Bump follow-redirects from 1.12.1 to 1.14.7 in /docs Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.12.1 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.12.1...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/yarn.lock b/docs/yarn.lock index f3fc8b0..cb1962c 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -4254,9 +4254,9 @@ flush-write-stream@^2.0.0: readable-stream "^3.1.1" follow-redirects@^1.0.0, follow-redirects@^1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6" - integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== for-in@^1.0.2: version "1.0.2" From 3a7128193783d67e32eab27e90c33a4300a1a5a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 21:13:50 +0000 Subject: [PATCH 08/10] Bump node-forge from 0.10.0 to 1.0.0 in /docs Bumps [node-forge](https://github.com/digitalbazaar/forge) from 0.10.0 to 1.0.0. - [Release notes](https://github.com/digitalbazaar/forge/releases) - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](https://github.com/digitalbazaar/forge/compare/0.10.0...v1.0.0) --- updated-dependencies: - dependency-name: node-forge dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/package.json | 2 +- docs/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/package.json b/docs/package.json index ae416aa..d9e123f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -434,7 +434,7 @@ "neo-async": "^2.6.2", "nice-try": "^2.0.1", "no-case": "^3.0.3", - "node-forge": "^0.10.0", + "node-forge": "^1.0.0", "node-libs-browser": "^2.2.1", "node-releases": "^1.1.60", "nopt": "^4.0.3", diff --git a/docs/yarn.lock b/docs/yarn.lock index f3fc8b0..0e9644f 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -6595,10 +6595,10 @@ node-forge@0.9.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ== -node-forge@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" - integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-forge@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.0.0.tgz#a025e3beeeb90d9cee37dae34d25b968ec3e6f15" + integrity sha512-ShkiiAlzSsgH1IwGlA0jybk9vQTIOLyJ9nBd0JTuP+nzADJFLY0NoDijM2zvD/JaezooGu3G2p2FNxOAK6459g== node-libs-browser@^2.2.1: version "2.2.1" From a2c01655f04a995d5e955b49b29fa2411eaeb95d Mon Sep 17 00:00:00 2001 From: Troy Kelly Date: Sat, 15 Jan 2022 09:48:04 +0000 Subject: [PATCH 09/10] Added Constellix --- global/certbot-dns-plugins.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 7f7d8c3..3243aec 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -102,6 +102,17 @@ dns_cloudxns_secret_key = 1122334455667788`, full_plugin_name: 'dns-cloudxns', }, //####################################################// + constellix: { + display_name: 'Constellix', + package_name: 'certbot-dns-constellix', + version_requirement: '~=0.2.1', + dependencies: '', + credentials: `dns_constellix_apikey = 5fb4e76f-ac91-43e5-f982458bc595 +dns_constellix_secretkey = 47d99fd0-32e7-4e07-85b46d08e70b +dns_constellix_endpoint = https://api.dns.constellix.com/v1`, + full_plugin_name: 'dns-constellix', + }, + //####################################################// corenetworks: { display_name: 'Core Networks', package_name: 'certbot-dns-corenetworks', From 4f97592965d0ce3981793ccee77f94e4e6141f59 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Mon, 17 Jan 2022 10:48:57 +1000 Subject: [PATCH 10/10] Bump version --- .version | 2 +- README.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 2e12e47..54f7286 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.9.14 +2.9.15 diff --git a/README.md b/README.md index 64c7c7a..903e243 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + @@ -511,6 +511,12 @@ Special thanks to the following contributors:
Pius Walter + + + +
Troy Kelly + +