Skip to content

Commit 29d4bd4

Browse files
jc21jc21
authored
Merge pull request #1517 from jc21/develop
v2.9.10
2 parents 06c5f99 + 925ad90 commit 29d4bd4

File tree

17 files changed

+694
-569
lines changed

17 files changed

+694
-569
lines changed

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.9.9
1+
2.9.10

‎README.md‎

Lines changed: 7 additions & 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.9-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.9.10-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>
@@ -501,6 +501,12 @@ Special thanks to the following contributors:
501501
<br /><sub><b>Josh Byrnes</b></sub>
502502
</a>
503503
</td>
504+
<td align="center">
505+
<a href="https://github.com/bergi9">
506+
<img src="https://avatars.githubusercontent.com/u/5556750?v=4" width="80" alt=""/>
507+
<br /><sub><b>bergi9</b></sub>
508+
</a>
509+
</td>
504510
</tr>
505511
</table>
506512
<!-- markdownlint-enable -->

‎backend/internal/certificate.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const internalCertificate = {
114114
data.owner_user_id = access.token.getUserId(1);
115115

116116
if (data.provider === 'letsencrypt') {
117-
data.nice_name = data.domain_names.sort().join(', ');
117+
data.nice_name = data.domain_names.join(', ');
118118
}
119119

120120
return certificateModel
@@ -869,7 +869,7 @@ const internalCertificate = {
869869

870870
const credentialsLocation = '/etc/letsencrypt/credentials/credentials-' + certificate.id;
871871
const credentialsCmd = 'mkdir -p /etc/letsencrypt/credentials 2> /dev/null; echo \'' + certificate.meta.dns_provider_credentials.replace('\'', '\\\'') + '\' > \'' + credentialsLocation + '\' && chmod 600 \'' + credentialsLocation + '\'';
872-
const prepareCmd = 'pip install ' + dns_plugin.package_name + '==' + dns_plugin.package_version + ' ' + dns_plugin.dependencies;
872+
const prepareCmd = 'pip install ' + dns_plugin.package_name + (dns_plugin.version_requirement || '') + ' ' + dns_plugin.dependencies;
873873

874874
// Whether the plugin has a --<name>-credentials argument
875875
const hasConfigArg = certificate.meta.dns_provider !== 'route53';

‎backend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"mysql": "^2.18.1",
2626
"node-rsa": "^1.0.8",
2727
"nodemon": "^2.0.2",
28-
"objection": "^2.1.3",
28+
"objection": "^2.2.16",
2929
"path": "^0.12.7",
3030
"pg": "^7.12.1",
3131
"restler": "^3.4.0",

‎backend/schema/definitions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"example": "[email protected]",
154154
"format": "email",
155155
"type": "string",
156-
"minLength": 8,
156+
"minLength": 6,
157157
"maxLength": 100
158158
},
159159
"password": {

‎backend/setup.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ const setupCertbotPlugins = () => {
175175
certificates.map(function (certificate) {
176176
if (certificate.meta && certificate.meta.dns_challenge === true) {
177177
const dns_plugin = dns_plugins[certificate.meta.dns_provider];
178-
const packages_to_install = `${dns_plugin.package_name}==${dns_plugin.package_version} ${dns_plugin.dependencies}`;
178+
const packages_to_install = `${dns_plugin.package_name}${dns_plugin.version_requirement || ''} ${dns_plugin.dependencies}`;
179179

180180
if (plugins.indexOf(packages_to_install) === -1) plugins.push(packages_to_install);
181181

‎backend/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ acorn@^7.1.1:
7777
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
7878
integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
7979

80-
ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0:
81-
version "6.12.3"
82-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
83-
integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
80+
ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.6:
81+
version "6.12.6"
82+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
83+
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
8484
dependencies:
8585
fast-deep-equal "^3.1.1"
8686
fast-json-stable-stringify "^2.0.0"
@@ -2572,12 +2572,12 @@ object.pick@^1.2.0, object.pick@^1.3.0:
25722572
dependencies:
25732573
isobject "^3.0.1"
25742574

2575-
objection@^2.1.3:
2576-
version "2.2.2"
2577-
resolved "https://registry.yarnpkg.com/objection/-/objection-2.2.2.tgz#1a3c9010270e3677940d2bc91aeaeb3c0f103800"
2578-
integrity sha512-+1Ap7u9NQRochzDW5/BggUlKi94JfZGTJwQJuNXo8DwmAb8czEirvxcWBcX91/MmQq0BQUJjM4RPSiZhnkkWQw==
2575+
objection@^2.2.16:
2576+
version "2.2.16"
2577+
resolved "https://registry.yarnpkg.com/objection/-/objection-2.2.16.tgz#552ec6d625a7f80d6e204fc63732cbd3fc56f31c"
2578+
integrity sha512-sq8erZdxW5ruPUK6tVvwDxyO16U49XAn/BmOm2zaNhNA2phOPCe2/7+R70nDEF1SFrgJOrwDu/PtoxybuJxnjQ==
25792579
dependencies:
2580-
ajv "^6.12.0"
2580+
ajv "^6.12.6"
25812581
db-errors "^0.2.3"
25822582

25832583
on-finished@~2.3.0:

‎docker/rootfs/etc/letsencrypt.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ non-interactive = True
33
webroot-path = /data/letsencrypt-acme-challenge
44
key-type = ecdsa
55
elliptic-curve = secp384r1
6+
preferred-chain = ISRG Root X1

‎docs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
"normalize-url": "^5.1.0",
444444
"npm-run-path": "^4.0.1",
445445
"nprogress": "^0.2.0",
446-
"nth-check": "^1.0.2",
446+
"nth-check": "^2.0.1",
447447
"num2fraction": "^1.2.2",
448448
"number-is-nan": "^2.0.0",
449449
"oauth-sign": "^0.9.0",
@@ -612,7 +612,7 @@
612612
"serve-index": "^1.9.1",
613613
"serve-static": "^1.14.1",
614614
"set-blocking": "^2.0.0",
615-
"set-value": "^3.0.2",
615+
"set-value": "^4.0.1",
616616
"setimmediate": "^1.0.5",
617617
"setprototypeof": "^1.2.0",
618618
"sha.js": "^2.4.11",

‎docs/yarn.lock‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,9 +1624,9 @@ ansi-regex@^4.1.0:
16241624
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
16251625

16261626
ansi-regex@^5.0.0:
1627-
version "5.0.0"
1628-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
1629-
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
1627+
version "5.0.1"
1628+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
1629+
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
16301630

16311631
ansi-styles@^2.2.1:
16321632
version "2.2.1"
@@ -6726,6 +6726,13 @@ nth-check@^1.0.2, nth-check@~1.0.1:
67266726
dependencies:
67276727
boolbase "~1.0.0"
67286728

6729+
nth-check@^2.0.1:
6730+
version "2.0.1"
6731+
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
6732+
integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
6733+
dependencies:
6734+
boolbase "^1.0.0"
6735+
67296736
num2fraction@^1.2.2:
67306737
version "1.2.2"
67316738
resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -7699,9 +7706,9 @@ pretty-time@^1.1.0:
76997706
integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==
77007707

77017708
prismjs@^1.13.0, prismjs@^1.20.0:
7702-
version "1.24.0"
7703-
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.24.0.tgz#0409c30068a6c52c89ef7f1089b3ca4de56be2ac"
7704-
integrity sha512-SqV5GRsNqnzCL8k5dfAjCNhUrF3pR0A9lTDSCUZeh/LIshheXJEaP0hwLz2t4XHivd2J/v2HR+gRnigzeKe3cQ==
7709+
version "1.25.0"
7710+
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756"
7711+
integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==
77057712

77067713
private@^0.1.8:
77077714
version "0.1.8"
@@ -8436,13 +8443,20 @@ set-value@^2.0.0, set-value@^2.0.1:
84368443
is-plain-object "^2.0.3"
84378444
split-string "^3.0.1"
84388445

8439-
set-value@^3.0.0, set-value@^3.0.2:
8446+
set-value@^3.0.0:
84408447
version "3.0.2"
84418448
resolved "https://registry.yarnpkg.com/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90"
84428449
integrity sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==
84438450
dependencies:
84448451
is-plain-object "^2.0.4"
84458452

8453+
set-value@^4.0.1:
8454+
version "4.0.1"
8455+
resolved "https://registry.yarnpkg.com/set-value/-/set-value-4.0.1.tgz#bc23522ade2d52314ec3b5d6fb140f5cd3a88acf"
8456+
integrity sha512-ayATicCYPVnlNpFmjq2/VmVwhoCQA9+13j8qWp044fmFE3IFphosPtRM+0CJ5xoIx5Uy52fCcwg3XeH2pHbbPQ==
8457+
dependencies:
8458+
is-plain-object "^2.0.4"
8459+
84468460
setimmediate@^1.0.4, setimmediate@^1.0.5:
84478461
version "1.0.5"
84488462
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"

0 commit comments

Comments
 (0)