Skip to content

Commit 86eeb5f

Browse files
authored
Merge pull request #1084 from jc21/develop
v2.9.2
2 parents 07884bc + 62a708b commit 86eeb5f

File tree

9 files changed

+117
-64
lines changed

9 files changed

+117
-64
lines changed

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.1
1+
2.9.2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p align="center">
22
<img src="https://nginxproxymanager.com/github.png">
33
<br><br>
4-
<img src="https://img.shields.io/badge/version-2.9.1-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.9.2-green.svg?style=for-the-badge">
55
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
66
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
77
</a>

backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"jsonwebtoken": "^8.5.1",
2020
"knex": "^0.20.13",
2121
"liquidjs": "^9.11.10",
22-
"lodash": "^4.17.19",
22+
"lodash": "^4.17.21",
2323
"moment": "^2.24.0",
2424
"mysql": "^2.18.1",
2525
"node-rsa": "^1.0.8",

backend/templates/proxy_host.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ proxy_http_version 1.1;
5353

5454
{% include "_hsts.conf" %}
5555

56+
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
57+
proxy_set_header Upgrade $http_upgrade;
58+
proxy_set_header Connection $http_connection;
59+
proxy_http_version 1.1;
60+
{% endif %}
61+
5662
# Proxy!
5763
include conf.d/include/proxy.conf;
5864
}

backend/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,10 +2024,10 @@ lodash.once@^4.0.0:
20242024
resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
20252025
integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
20262026

2027-
lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19:
2028-
version "4.17.19"
2029-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
2030-
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
2027+
lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
2028+
version "4.17.21"
2029+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
2030+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
20312031

20322032
lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
20332033
version "1.0.1"

docs/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5993,9 +5993,9 @@ lodash.uniq@^4.5.0:
59935993
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
59945994

59955995
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.5:
5996-
version "4.17.19"
5997-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
5998-
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
5996+
version "4.17.21"
5997+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5998+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
59995999

60006000
loglevel@^1.6.8:
60016001
version "1.6.8"
@@ -9632,9 +9632,9 @@ url-parse-lax@^3.0.0:
96329632
prepend-http "^2.0.0"
96339633

96349634
url-parse@^1.4.3, url-parse@^1.4.7:
9635-
version "1.4.7"
9636-
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
9637-
integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
9635+
version "1.5.0"
9636+
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.0.tgz#90aba6c902aeb2d80eac17b91131c27665d5d828"
9637+
integrity sha512-9iT6N4s93SMfzunOyDPe4vo4nLcSu1yq0IQK1gURmjm8tQNlM6loiuCRrKG1hHGXfB2EWd6H4cGi7tGdaygMFw==
96389638
dependencies:
96399639
querystringify "^2.1.1"
96409640
requires-port "^1.0.0"

frontend/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3541,9 +3541,9 @@ homedir-polyfill@^1.0.1:
35413541
parse-passwd "^1.0.0"
35423542

35433543
hosted-git-info@^2.1.4:
3544-
version "2.8.8"
3545-
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
3546-
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
3544+
version "2.8.9"
3545+
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
3546+
integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
35473547

35483548
html-minifier-terser@^5.0.1:
35493549
version "5.1.1"
@@ -4278,9 +4278,9 @@ lodash.some@^4.6.0:
42784278
integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
42794279

42804280
lodash@^4.0.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@~4.17.10:
4281-
version "4.17.19"
4282-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
4283-
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
4281+
version "4.17.21"
4282+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
4283+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
42844284

42854285
longest@^1.0.1:
42864286
version "1.0.1"

global/certbot-dns-plugins.js

Lines changed: 88 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
2020
*/
2121

2222
module.exports = {
23+
//####################################################//
24+
acmedns: {
25+
display_name: 'ACME-DNS',
26+
package_name: 'certbot-dns-acmedns',
27+
package_version: '0.1.0',
28+
dependencies: '',
29+
credentials: `certbot_dns_acmedns:dns_acmedns_api_url = http://acmedns-server/
30+
certbot_dns_acmedns:dns_acmedns_registration_file = /data/acme-registration.json`,
31+
full_plugin_name: 'certbot-dns-acmedns:dns-acmedns',
32+
},
2333
aliyun: {
2434
display_name: 'Aliyun',
2535
package_name: 'certbot-dns-aliyun',
@@ -30,6 +40,32 @@ certbot_dns_aliyun:dns_aliyun_access_key_secret = 1234567890abcdef1234567890abcd
3040
full_plugin_name: 'certbot-dns-aliyun:dns-aliyun',
3141
},
3242
//####################################################//
43+
azure: {
44+
display_name: 'Azure',
45+
package_name: 'certbot-dns-azure',
46+
package_version: '1.1.0',
47+
dependencies: '',
48+
credentials: `# This plugin supported API authentication using either Service Principals or utilizing a Managed Identity assigned to the virtual machine.
49+
# Regardless which authentication method used, the identity will need the “DNS Zone Contributor” role assigned to it.
50+
# As multiple Azure DNS Zones in multiple resource groups can exist, the config file needs a mapping of zone to resource group ID. Multiple zones -> ID mappings can be listed by using the key dns_azure_zoneX where X is a unique number. At least 1 zone mapping is required.
51+
52+
# Using a service principal (option 1)
53+
dns_azure_sp_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5
54+
dns_azure_sp_client_secret = E-xqXU83Y-jzTI6xe9fs2YC~mck3ZzUih9
55+
dns_azure_tenant_id = ed1090f3-ab18-4b12-816c-599af8a88cf7
56+
57+
# Using used assigned MSI (option 2)
58+
# dns_azure_msi_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5
59+
60+
# Using system assigned MSI (option 3)
61+
# dns_azure_msi_system_assigned = true
62+
63+
# Zones (at least one always required)
64+
dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1
65+
dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf2744622/resourceGroups/dns2`,
66+
full_plugin_name: 'dns-azure',
67+
},
68+
//####################################################//
3369
cloudflare: {
3470
display_name: 'Cloudflare',
3571
package_name: 'certbot-dns-cloudflare',
@@ -40,6 +76,22 @@ dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567`,
4076
full_plugin_name: 'dns-cloudflare',
4177
},
4278
//####################################################//
79+
cloudns: {
80+
display_name: 'ClouDNS',
81+
package_name: 'certbot-dns-cloudns',
82+
package_version: '0.4.0',
83+
dependencies: '',
84+
credentials: `# Target user ID (see https://www.cloudns.net/api-settings/)
85+
dns_cloudns_auth_id=1234
86+
# Alternatively, one of the following two options can be set:
87+
# dns_cloudns_sub_auth_id=1234
88+
# dns_cloudns_sub_auth_user=foobar
89+
90+
# API password
91+
dns_cloudns_auth_password=password1`,
92+
full_plugin_name: 'dns-cloudns',
93+
},
94+
//####################################################//
4395
cloudxns: {
4496
display_name: 'CloudXNS',
4597
package_name: 'certbot-dns-cloudxns',
@@ -71,6 +123,15 @@ certbot_dns_cpanel:cpanel_password = hunter2`,
71123
full_plugin_name: 'certbot-dns-cpanel:cpanel',
72124
},
73125
//####################################################//
126+
duckdns: {
127+
display_name: 'DuckDNS',
128+
package_name: 'certbot-dns-duckdns',
129+
package_version: '0.5',
130+
dependencies: '',
131+
credentials: 'dns_duckdns_token=<your-duckdns-token>',
132+
full_plugin_name: 'dns-duckdns',
133+
},
134+
//####################################################//
74135
digitalocean: {
75136
display_name: 'DigitalOcean',
76137
package_name: 'certbot-dns-digitalocean',
@@ -120,6 +181,17 @@ certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`,
120181
full_plugin_name: 'certbot-dns-dnspod:dns-dnspod',
121182
},
122183
//####################################################//
184+
eurodns: {
185+
display_name: 'EuroDNS',
186+
package_name: 'certbot-dns-eurodns',
187+
package_version: '0.0.4',
188+
dependencies: '',
189+
credentials: `dns_eurodns_applicationId = myuser
190+
dns_eurodns_apiKey = mysecretpassword
191+
dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`,
192+
full_plugin_name: 'certbot-dns-eurodns:dns-eurodns',
193+
},
194+
//####################################################//
123195
gandi: {
124196
display_name: 'Gandi Live DNS',
125197
package_name: 'certbot_plugin_gandi',
@@ -254,6 +326,16 @@ certbot_dns_powerdns:dns_powerdns_api_key = AbCbASsd!@34`,
254326
full_plugin_name: 'certbot-dns-powerdns:dns-powerdns',
255327
},
256328
//####################################################//
329+
regru: {
330+
display_name: 'reg.ru',
331+
package_name: 'certbot-regru',
332+
package_version: '1.0.2',
333+
dependencies: '',
334+
credentials: `certbot_regru:dns_username=username
335+
certbot_regru:dns_password=password`,
336+
full_plugin_name: 'certbot-regru:dns',
337+
},
338+
//####################################################//
257339
rfc2136: {
258340
display_name: 'RFC 2136',
259341
package_name: 'certbot-dns-rfc2136',
@@ -283,26 +365,6 @@ aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`,
283365
full_plugin_name: 'dns-route53',
284366
},
285367
//####################################################//
286-
vultr: {
287-
display_name: 'Vultr',
288-
package_name: 'certbot-dns-vultr',
289-
package_version: '1.0.3',
290-
dependencies: '',
291-
credentials: 'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY',
292-
full_plugin_name: 'certbot-dns-vultr:dns-vultr',
293-
},
294-
//####################################################//
295-
eurodns: {
296-
display_name: 'EuroDNS',
297-
package_name: 'certbot-dns-eurodns',
298-
package_version: '0.0.4',
299-
dependencies: '',
300-
credentials: `dns_eurodns_applicationId = myuser
301-
dns_eurodns_apiKey = mysecretpassword
302-
dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`,
303-
full_plugin_name: 'certbot-dns-eurodns:dns-eurodns',
304-
},
305-
//####################################################//
306368
transip: {
307369
display_name: 'TransIP',
308370
package_name: 'certbot-dns-transip',
@@ -313,22 +375,12 @@ certbot_dns_transip:dns_transip_key_file = /etc/letsencrypt/transip-rsa.key`,
313375
full_plugin_name: 'certbot-dns-transip:dns-transip',
314376
},
315377
//####################################################//
316-
acmedns: {
317-
display_name: 'ACME-DNS',
318-
package_name: 'certbot-dns-acmedns',
319-
package_version: '0.1.0',
320-
dependencies: '',
321-
credentials: `certbot_dns_acmedns:dns_acmedns_api_url = http://acmedns-server/
322-
certbot_dns_acmedns:dns_acmedns_registration_file = /data/acme-registration.json`,
323-
full_plugin_name: 'certbot-dns-acmedns:dns-acmedns',
324-
},
325-
//####################################################//
326-
duckdns: {
327-
display_name: 'DuckDNS',
328-
package_name: 'certbot-dns-duckdns',
329-
package_version: '0.5',
378+
vultr: {
379+
display_name: 'Vultr',
380+
package_name: 'certbot-dns-vultr',
381+
package_version: '1.0.3',
330382
dependencies: '',
331-
credentials: '<DUCKDNS_TOKEN>',
332-
full_plugin_name: 'certbot-dns-duckdns:dns-duckdns',
383+
credentials: 'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY',
384+
full_plugin_name: 'certbot-dns-vultr:dns-vultr',
333385
},
334386
};

test/yarn.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,15 +1670,10 @@ lodash.once@^4.1.1:
16701670
resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
16711671
integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
16721672

1673-
lodash@^4.17.14, lodash@^4.17.15:
1674-
version "4.17.15"
1675-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
1676-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
1677-
1678-
lodash@^4.17.19:
1679-
version "4.17.19"
1680-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
1681-
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
1673+
lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19:
1674+
version "4.17.21"
1675+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
1676+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
16821677

16831678
16841679
version "3.0.0"

0 commit comments

Comments
 (0)