From 3dfe23836ce5616664b2d208dd6f3dd724a5e11e Mon Sep 17 00:00:00 2001 From: Paul Mansfield Date: Mon, 29 Nov 2021 13:48:39 +0000 Subject: [PATCH 1/5] Add two new headers to proxy.conf Fixes #1609. Adding both X-Forwarded-Host and X-Forwarded-Port, this is vital for some services behind a proxy (used to allow creation of absolute links in html). I've had to include at least the Host version in the past for jenkins and nexus. Been running locally for 24 hours, does not appear to break any of my 15+ services currently running behind NPM would allow people to host those services without the need for advanced configuration --- docker/rootfs/etc/nginx/conf.d/include/proxy.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf index fcaaf003..e2cb451e 100644 --- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf +++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf @@ -2,6 +2,8 @@ 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 2ac1026e4b2d4edf1f39dee3fb3bfed8585bfed1 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 22 Dec 2021 11:05:57 +1000 Subject: [PATCH 2/5] Hack for python binary in newer node images --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3161a254..a0f21e10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { -v "$(pwd)/global:/app/global" \\ -w /app \\ node:latest \\ - sh -c "yarn install && yarn eslint . && rm -rf node_modules" + sh -c "ln -s /usr/bin/python3 /usr/bin/python && yarn install && yarn eslint . && rm -rf node_modules" ''' echo 'Docker Build ...' From 5d106c40640224a176712cbba882146dbdc4680b Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 22 Dec 2021 11:51:32 +1000 Subject: [PATCH 3/5] Bump version --- .version | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index d9d36012..b7b61677 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.9.12 +2.9.13 diff --git a/README.md b/README.md index f8c07241..7d03016a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + From ab80fe13e9968f6adbdc1783f71d08098a9f926d Mon Sep 17 00:00:00 2001 From: chaptergy Date: Thu, 23 Dec 2021 12:23:30 +0100 Subject: [PATCH 4/5] Fixes custom certificate upload modal --- frontend/js/app/nginx/certificates/form.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/js/app/nginx/certificates/form.js b/frontend/js/app/nginx/certificates/form.js index 56b31cf2..a56c3f8e 100644 --- a/frontend/js/app/nginx/certificates/form.js +++ b/frontend/js/app/nginx/certificates/form.js @@ -278,9 +278,11 @@ module.exports = Mn.View.extend({ this.ui.credentials_file_content.hide(); this.ui.loader_content.hide(); this.ui.le_error_info.hide(); - const domainNames = this.ui.domain_names[0].value.split(','); - if (!domainNames || domainNames.length === 0 || (domainNames.length === 1 && domainNames[0] === "")) { - this.ui.test_domains_button.prop('disabled', true); + if (this.ui.domain_names[0]) { + const domainNames = this.ui.domain_names[0].value.split(','); + if (!domainNames || domainNames.length === 0 || (domainNames.length === 1 && domainNames[0] === "")) { + this.ui.test_domains_button.prop('disabled', true); + } } }, From 7800938fd2ffa9e7faa1c4d286d0f7fb0d3516ba Mon Sep 17 00:00:00 2001 From: Tobias Kneidl Date: Wed, 22 Dec 2021 00:24:05 +0100 Subject: [PATCH 5/5] Update default.conf --- backend/templates/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/templates/default.conf b/backend/templates/default.conf index 5196f285..ec68530c 100644 --- a/backend/templates/default.conf +++ b/backend/templates/default.conf @@ -7,9 +7,9 @@ server { listen 80 default; {% if ipv6 -%} - listen [::]:80; + listen [::]:80 default; {% else -%} - #listen [::]:80; + #listen [::]:80 default; {% endif %} server_name default-host.localhost; access_log /data/logs/default-host_access.log combined;