From 47b868bfc6a341e691d5c0408977e547f06dfd0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 22:36:30 +0000 Subject: [PATCH 01/15] Bump vite from 5.0.11 to 5.0.12 in /docs Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.11 to 5.0.12. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.0.12/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... 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 a0c0762b..1ddbc9d8 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -3086,8 +3086,8 @@ __metadata: linkType: hard "vite@npm:~5.0.0": - version: 5.0.11 - resolution: "vite@npm:5.0.11" + version: 5.0.12 + resolution: "vite@npm:5.0.12" dependencies: esbuild: "npm:^0.19.3" fsevents: "npm:~2.3.3" @@ -3121,7 +3121,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 74a3ddc6d43cf19cb6f827a53d77c481a07517a72b7d82a178df082012ad81ab5231a287a6dcc5471c0b2a5c8dd7e6ea8e1d62d268803057d0315729f09c5e33 + checksum: c51b8e458851943c903fddde6973e720099ef8a5f364fb107cddade59c9e90f6d9ad98b61a7419cdfa0c6374236e10bff965d0c2d9e7b1790c68b874e5e7950c languageName: node linkType: hard From 39f48364859b3eebb7d12f1b62ce9bb3bbfae228 Mon Sep 17 00:00:00 2001 From: Setrin Date: Tue, 30 Jan 2024 20:57:19 +0100 Subject: [PATCH 02/15] Updated certbot-dns-webstorm plugin to 2.0.1 --- global/certbot-dns-plugins.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index a86d0719..eb620b95 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -418,7 +418,7 @@ "websupportsk": { "name": "Websupport.sk", "package_name": "certbot-dns-websupportsk", - "version": "~=0.1.6", + "version": "~=2.0.1", "dependencies": "", "credentials": "dns_websupportsk_api_key = \ndns_websupportsk_secret = \ndns_websupportsk_domain = example.com", "full_plugin_name": "dns-websupportsk" From a94660120f2870dfaef7a96f05483d160fcecfa0 Mon Sep 17 00:00:00 2001 From: Setrin Date: Tue, 30 Jan 2024 22:17:33 +0100 Subject: [PATCH 03/15] Renamed certbot-dns-websupportsk plugin to certbot-dns-websupport & updatedcredentials --- global/certbot-dns-plugins.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index eb620b95..77d0db7f 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -417,10 +417,10 @@ }, "websupportsk": { "name": "Websupport.sk", - "package_name": "certbot-dns-websupportsk", + "package_name": "certbot-dns-websupport", "version": "~=2.0.1", "dependencies": "", - "credentials": "dns_websupportsk_api_key = \ndns_websupportsk_secret = \ndns_websupportsk_domain = example.com", + "credentials": "dns_websupport_identifier = \ndns_websupport_secret_key = ", "full_plugin_name": "dns-websupportsk" } } From 5b53825ccb505fcda03fc4da846cea11cda09ae4 Mon Sep 17 00:00:00 2001 From: Setrin Date: Tue, 30 Jan 2024 22:46:05 +0100 Subject: [PATCH 04/15] Fixed certbot-dns-websupport plugin name --- global/certbot-dns-plugins.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index 77d0db7f..af494036 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -415,12 +415,12 @@ "credentials": "dns_vultr_key = YOUR_VULTR_API_KEY", "full_plugin_name": "dns-vultr" }, - "websupportsk": { + "websupport": { "name": "Websupport.sk", "package_name": "certbot-dns-websupport", "version": "~=2.0.1", "dependencies": "", "credentials": "dns_websupport_identifier = \ndns_websupport_secret_key = ", - "full_plugin_name": "dns-websupportsk" + "full_plugin_name": "dns-websupport" } } From eaa11fe460d4202a15360cb7a2b09f6480e3c91b Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Sun, 4 Feb 2024 18:50:50 +0900 Subject: [PATCH 05/15] Update README.md a -> an --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e6880c5f..940f8761 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ running at home or otherwise, including free SSL, without having to know too muc ## Project Goal -I created this project to fill a personal need to provide users with a easy way to accomplish reverse +I created this project to fill a personal need to provide users with an easy way to accomplish reverse proxying hosts with SSL termination and it had to be so easy that a monkey could do it. This goal hasn't changed. While there might be advanced options they are optional and the project should be as simple as possible so that the barrier for entry here is low. From e42e2acf12b189db680f53255096a9e3bfef517f Mon Sep 17 00:00:00 2001 From: hywax Date: Wed, 7 Feb 2024 13:12:20 +0500 Subject: [PATCH 06/15] Add DNS Provider TimeWeb Cloud --- global/certbot-dns-plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index a86d0719..491ef051 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -391,6 +391,14 @@ "credentials": "dns_strato_username = user\ndns_strato_password = pass\n# uncomment if youre using two factor authentication:\n# dns_strato_totp_devicename = 2fa_device\n# dns_strato_totp_secret = 2fa_secret\n#\n# uncomment if domain name contains special characters\n# insert domain display name as seen on your account page here\n# dns_strato_domain_display_name = my-punicode-url.de\n#\n# if youre not using strato.de or another special endpoint you can customise it below\n# you will probably only need to adjust the host, but you can also change the complete endpoint url\n# dns_strato_custom_api_scheme = https\n# dns_strato_custom_api_host = www.strato.de\n# dns_strato_custom_api_port = 443\n# dns_strato_custom_api_path = \"/apps/CustomerService\"", "full_plugin_name": "dns-strato" }, + "timeweb": { + "name": "Timeweb Cloud", + "package_name": "certbot-dns-timeweb", + "version": "~=1.0.0", + "dependencies": "", + "credentials": "dns_timeweb_api_key = XXXXXXXXXXXXXXXXXXX", + "full_plugin_name": "dns-timeweb" + }, "transip": { "name": "TransIP", "package_name": "certbot-dns-transip", From f0c75641d886f5a8dd2f8fee86f910be07c64522 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Wed, 7 Feb 2024 12:44:37 +0100 Subject: [PATCH 07/15] the generated keys appear to be for JWT, not GPG --- docs/setup/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup/README.md b/docs/setup/README.md index 9c763bf9..d881d88d 100644 --- a/docs/setup/README.md +++ b/docs/setup/README.md @@ -120,7 +120,7 @@ Please note that the `jc21/mariadb-aria:latest` image might have some problems o After the app is running for the first time, the following will happen: -1. GPG keys will be generated and saved in the data folder +1. JWT keys will be generated and saved in the data folder 2. The database will initialize with table structures 3. A default admin user will be created From 577954ef8cc66a876d768edd2fbccbebf3236f93 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 8 Feb 2024 03:20:53 +0500 Subject: [PATCH 08/15] Bump version DNS Provider TimeWeb Cloud --- global/certbot-dns-plugins.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index 491ef051..26db9643 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -394,7 +394,7 @@ "timeweb": { "name": "Timeweb Cloud", "package_name": "certbot-dns-timeweb", - "version": "~=1.0.0", + "version": "~=1.0.1", "dependencies": "", "credentials": "dns_timeweb_api_key = XXXXXXXXXXXXXXXXXXX", "full_plugin_name": "dns-timeweb" From 1c84eaac028b7c61f7f332c03b9196f75e756b87 Mon Sep 17 00:00:00 2001 From: Brian Cassidy Date: Thu, 15 Feb 2024 23:41:00 -0400 Subject: [PATCH 09/15] Add FreeDNS certbot plugin Info from #2352 and https://github.com/schleuss/certbot_dns_freedns --- global/certbot-dns-plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index a86d0719..2aff0f79 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -167,6 +167,14 @@ "credentials": "dns_eurodns_applicationId = myuser\ndns_eurodns_apiKey = mysecretpassword\ndns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy", "full_plugin_name": "dns-eurodns" }, + "freedns": { + "name": "FreeDNS", + "package_name": "certbot-dns-freedns", + "version": "~=0.1.0", + "dependencies": "", + "credentials": "dns_freedns_username = myremoteuser\ndns_freedns_password = verysecureremoteuserpassword", + "full_plugin_name": "dns-freedns" + }, "gandi": { "name": "Gandi Live DNS", "package_name": "certbot_plugin_gandi", From 40d81d6e443ad7f9f9547866a243ba958225a52a Mon Sep 17 00:00:00 2001 From: Derek Rachul Date: Sat, 17 Feb 2024 12:32:05 -0800 Subject: [PATCH 10/15] Adding easyDNS provider. --- global/certbot-dns-plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json index a86d0719..4cba4b34 100644 --- a/global/certbot-dns-plugins.json +++ b/global/certbot-dns-plugins.json @@ -159,6 +159,14 @@ "credentials": "dns_dynu_auth_token = YOUR_DYNU_AUTH_TOKEN", "full_plugin_name": "dns-dynu" }, + "easydns": { + "name": "easyDNS", + "package_name": "certbot-dns-easydns", + "version": "~=0.1.2", + "dependencies": "", + "credentials": "dns_easydns_usertoken = YOUR_EASYDNS_USERTOKEN\ndns_easydns_userkey = YOUR_EASYDNS_USERKEY\ndns_easydns_endpoint = https://rest.easydns.net", + "full_plugin_name": "dns-easydns" + }, "eurodns": { "name": "EuroDNS", "package_name": "certbot-dns-eurodns", From 9c2e838d6115e89da19d08fc20f2999d9495db2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 03:12:49 +0000 Subject: [PATCH 11/15] Bump ip from 2.0.0 to 2.0.1 in /frontend Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1211a232..37e15886 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -3809,9 +3809,9 @@ invariant@^2.2.2: loose-envify "^1.0.0" ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" + integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ== is-accessor-descriptor@^0.1.6: version "0.1.6" From 1fb9a75a33903c97e9f5db98fade7224de06b45c Mon Sep 17 00:00:00 2001 From: David Indra Date: Fri, 23 Feb 2024 15:33:38 +0100 Subject: [PATCH 12/15] Fix: increase max number of domains to 100 --- backend/schema/definitions.json | 2 +- frontend/js/app/nginx/certificates/form.js | 2 +- frontend/js/app/nginx/dead/form.js | 2 +- frontend/js/app/nginx/proxy/form.js | 2 +- frontend/js/app/nginx/redirection/form.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/schema/definitions.json b/backend/schema/definitions.json index 6e0cf6aa..640093a0 100644 --- a/backend/schema/definitions.json +++ b/backend/schema/definitions.json @@ -172,7 +172,7 @@ "description": "Domain Names separated by a comma", "example": "*.jc21.com,blog.jc21.com", "type": "array", - "maxItems": 30, + "maxItems": 100, "uniqueItems": true, "items": { "type": "string", diff --git a/frontend/js/app/nginx/certificates/form.js b/frontend/js/app/nginx/certificates/form.js index d4a3b50a..cab09155 100644 --- a/frontend/js/app/nginx/certificates/form.js +++ b/frontend/js/app/nginx/certificates/form.js @@ -265,7 +265,7 @@ module.exports = Mn.View.extend({ this.ui.domain_names.selectize({ delimiter: ',', persist: false, - maxOptions: 30, + maxOptions: 100, create: function (input) { return { value: input, diff --git a/frontend/js/app/nginx/dead/form.js b/frontend/js/app/nginx/dead/form.js index 18d11ae0..a091717d 100644 --- a/frontend/js/app/nginx/dead/form.js +++ b/frontend/js/app/nginx/dead/form.js @@ -233,7 +233,7 @@ module.exports = Mn.View.extend({ this.ui.domain_names.selectize({ delimiter: ',', persist: false, - maxOptions: 30, + maxOptions: 100, create: function (input) { return { value: input, diff --git a/frontend/js/app/nginx/proxy/form.js b/frontend/js/app/nginx/proxy/form.js index 98f64566..4437a6dd 100644 --- a/frontend/js/app/nginx/proxy/form.js +++ b/frontend/js/app/nginx/proxy/form.js @@ -271,7 +271,7 @@ module.exports = Mn.View.extend({ this.ui.domain_names.selectize({ delimiter: ',', persist: false, - maxOptions: 30, + maxOptions: 100, create: function (input) { return { value: input, diff --git a/frontend/js/app/nginx/redirection/form.js b/frontend/js/app/nginx/redirection/form.js index ef48ffd1..5d061ff7 100644 --- a/frontend/js/app/nginx/redirection/form.js +++ b/frontend/js/app/nginx/redirection/form.js @@ -235,7 +235,7 @@ module.exports = Mn.View.extend({ this.ui.domain_names.selectize({ delimiter: ',', persist: false, - maxOptions: 30, + maxOptions: 100, create: function (input) { return { value: input, From 55d765e7856b6c9dc3fc532f9cd928459f36803f Mon Sep 17 00:00:00 2001 From: Tomas Michalek Date: Sun, 25 Feb 2024 22:38:50 +0100 Subject: [PATCH 13/15] Update README.md to support Podman Podman by default doesn't except the not fully qualified image urls. This commit adds the domain (docker.io) in order to resolve this issue. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e6880c5f..7eb04167 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ I won't go in to too much detail here but here are the basics for someone new to version: '3.8' services: app: - image: 'jc21/nginx-proxy-manager:latest' + image: 'docker.io/jc21/nginx-proxy-manager:latest' restart: unless-stopped ports: - '80:80' From 0503a6af75a43c0b2158dd6b4aa1b7930fdb9db5 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 26 Feb 2024 10:04:25 +1100 Subject: [PATCH 14/15] Fix so that nginx config is loaded after configuration happens M backend/internal/access-list.js --- backend/internal/access-list.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/internal/access-list.js b/backend/internal/access-list.js index 84577927..017fc738 100644 --- a/backend/internal/access-list.js +++ b/backend/internal/access-list.js @@ -204,7 +204,6 @@ const internalAccessList = { }); } }) - .then(internalNginx.reload) .then(() => { // Add to audit log return internalAuditLog.add(access, { @@ -227,7 +226,7 @@ const internalAccessList = { if (row.proxy_host_count) { return internalNginx.bulkGenerateConfigs('proxy_host', row.proxy_hosts); } - }) + }).then(internalNginx.reload) .then(() => { return internalAccessList.maskItems(row); }); From 10ece3548d42aa5dba424816f065827fdaf3f990 Mon Sep 17 00:00:00 2001 From: David Indra Date: Tue, 27 Feb 2024 00:42:58 +0100 Subject: [PATCH 15/15] Fixing "the map directive is not allowed here" at the validation stage (see https://github.com/NginxProxyManager/nginx-proxy-manager/pull/3478) --- backend/templates/_location.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/templates/_location.conf b/backend/templates/_location.conf index c561c274..2ee0d31b 100644 --- a/backend/templates/_location.conf +++ b/backend/templates/_location.conf @@ -1,5 +1,3 @@ - {% include "_hsts_map.conf" %} - location {{ path }} { proxy_set_header Host $host; proxy_set_header X-Forwarded-Scheme $scheme;