Skip to content

Commit 38fe7d8

Browse files
LePresidenteLePresidente
authored
Merge branch 'NginxProxyManager:develop' into develop
2 parents 0181697 + d2688cf commit 38fe7d8

File tree

11 files changed

+94
-43
lines changed

11 files changed

+94
-43
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pipeline {
221221
}
222222
post {
223223
always {
224-
sh 'docker-compose down --rmi all --remove-orphans --volumes -t 30'
224+
sh 'docker-compose down --remove-orphans --volumes -t 30'
225225
sh 'echo Reverting ownership'
226226
sh 'docker run --rm -v $(pwd):/data jc21/ci-tools chown -R $(id -u):$(id -g) /data'
227227
}

‎backend/package.json

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

‎backend/yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ astral-regex@^1.0.0:
246246
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
247247

248248
async@^3.2.0:
249-
version "3.2.1"
250-
resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8"
251-
integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==
249+
version "3.2.4"
250+
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
251+
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
252252

253253
atob@^2.1.2:
254254
version "2.1.2"
@@ -2271,10 +2271,10 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
22712271
dependencies:
22722272
minimist "^1.2.5"
22732273

2274-
moment@^2.24.0:
2275-
version "2.27.0"
2276-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
2277-
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
2274+
moment@^2.29.4:
2275+
version "2.29.4"
2276+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
2277+
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
22782278

22792279
[email protected]:
22802280
version "2.0.0"

‎docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
"etag": "^1.8.1",
214214
"eventemitter3": "^4.0.4",
215215
"events": "^3.2.0",
216-
"eventsource": "^1.0.7",
216+
"eventsource": "^2.0.2",
217217
"evp_bytestokey": "^1.0.3",
218218
"execa": "^4.0.3",
219219
"expand-brackets": "^4.0.0",

‎docs/yarn.lock

Lines changed: 60 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -967,6 +967,46 @@
967967
lodash "^4.17.19"
968968
to-fast-properties "^2.0.0"
969969

970+
"@jridgewell/gen-mapping@^0.3.0":
971+
version "0.3.2"
972+
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
973+
integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
974+
dependencies:
975+
"@jridgewell/set-array" "^1.0.1"
976+
"@jridgewell/sourcemap-codec" "^1.4.10"
977+
"@jridgewell/trace-mapping" "^0.3.9"
978+
979+
"@jridgewell/resolve-uri@^3.0.3":
980+
version "3.1.0"
981+
resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
982+
integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
983+
984+
"@jridgewell/set-array@^1.0.1":
985+
version "1.1.2"
986+
resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
987+
integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
988+
989+
"@jridgewell/source-map@^0.3.2":
990+
version "0.3.2"
991+
resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
992+
integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
993+
dependencies:
994+
"@jridgewell/gen-mapping" "^0.3.0"
995+
"@jridgewell/trace-mapping" "^0.3.9"
996+
997+
"@jridgewell/sourcemap-codec@^1.4.10":
998+
version "1.4.14"
999+
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
1000+
integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
1001+
1002+
"@jridgewell/trace-mapping@^0.3.9":
1003+
version "0.3.14"
1004+
resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
1005+
integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
1006+
dependencies:
1007+
"@jridgewell/resolve-uri" "^3.0.3"
1008+
"@jridgewell/sourcemap-codec" "^1.4.10"
1009+
9701010
"@mrmlnc/readdir-enhanced@^2.2.1":
9711011
version "2.2.1"
9721012
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1496,6 +1536,11 @@ acorn@^7.4.0:
14961536
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
14971537
integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
14981538

1539+
acorn@^8.5.0:
1540+
version "8.7.1"
1541+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
1542+
integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
1543+
14991544
agentkeepalive@^2.2.0:
15001545
version "2.2.0"
15011546
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-2.2.0.tgz#c5d1bd4b129008f1163f236f86e5faea2026e2ef"
@@ -3930,6 +3975,11 @@ eventsource@^1.0.7:
39303975
dependencies:
39313976
original "^1.0.0"
39323977

3978+
eventsource@^2.0.2:
3979+
version "2.0.2"
3980+
resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-2.0.2.tgz#76dfcc02930fb2ff339520b6d290da573a9e8508"
3981+
integrity sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==
3982+
39333983
evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
39343984
version "1.0.3"
39353985
resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -8766,10 +8816,10 @@ source-map-resolve@^0.6.0:
87668816
atob "^2.1.2"
87678817
decode-uri-component "^0.2.0"
87688818

8769-
source-map-support@^0.5.19, source-map-support@~0.5.12:
8770-
version "0.5.19"
8771-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
8772-
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
8819+
source-map-support@^0.5.19, source-map-support@~0.5.12, source-map-support@~0.5.20:
8820+
version "0.5.21"
8821+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
8822+
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
87738823
dependencies:
87748824
buffer-from "^1.0.0"
87758825
source-map "^0.6.0"
@@ -9241,13 +9291,14 @@ terser@^4.1.2:
92419291
source-map-support "~0.5.12"
92429292

92439293
terser@^5.0.0:
9244-
version "5.0.0"
9245-
resolved "https://registry.yarnpkg.com/terser/-/terser-5.0.0.tgz#269640e4e92f15d628de1e5f01c4c61e1ba3d765"
9246-
integrity sha512-olH2DwGINoSuEpSGd+BsPuAQaA3OrHnHnFL/rDB2TVNc3srUbz/rq/j2BlF4zDXI+JqAvGr86bIm1R2cJgZ3FA==
9294+
version "5.14.2"
9295+
resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
9296+
integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
92479297
dependencies:
9298+
"@jridgewell/source-map" "^0.3.2"
9299+
acorn "^8.5.0"
92489300
commander "^2.20.0"
9249-
source-map "~0.6.1"
9250-
source-map-support "~0.5.12"
9301+
source-map-support "~0.5.20"
92519302

92529303
text-table@^0.2.0:
92539304
version "0.2.0"

‎frontend/js/app/ui/footer/main.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="row align-items-center">
44
<div class="col-auto">
55
<ul class="list-inline list-inline-dots mb-0">
6-
<li class="list-inline-item"><a href="https://github.com/jc21/nginx-proxy-manager?utm_source=nginx-proxy-manager"><%- i18n('footer', 'fork-me') %></a></li>
6+
<li class="list-inline-item"><a href="https://github.com/jc21/nginx-proxy-manager?utm_source=nginx-proxy-manager" target="_blank"><%- i18n('footer', 'fork-me') %></a></li>
77
</ul>
88
</div>
99
</div>

‎frontend/js/i18n/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"access-list": "Access List",
133133
"allow-websocket-upgrade": "Websockets Support",
134134
"ignore-invalid-upstream-ssl": "Ignore Invalid SSL",
135-
"custom-forward-host-help": "Add a path for sub-folder forwarding.\nExample: 203.0.113.25/path",
135+
"custom-forward-host-help": "Add a path for sub-folder forwarding.\nExample: 203.0.113.25/path/",
136136
"search": "Search Host…"
137137
},
138138
"redirection-hosts": {
@@ -205,7 +205,7 @@
205205
"reachability-wrong-data": "There is a server found at this domain but it returned an unexpected data. Is it the NPM server? Please make sure your domain points to the IP where your NPM instance is running.",
206206
"reachability-other": "There is a server found at this domain but it returned an unexpected status code {code}. Is it the NPM server? Please make sure your domain points to the IP where your NPM instance is running.",
207207
"download": "Download",
208-
"renew-title": "Renew Let'sEncrypt Certificate",
208+
"renew-title": "Renew Let's Encrypt Certificate",
209209
"search": "Search Certificate…"
210210
},
211211
"access-lists": {

‎frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"messageformat": "^2.3.0",
2727
"messageformat-loader": "^0.8.1",
2828
"mini-css-extract-plugin": "^0.9.0",
29-
"moment": "^2.24.0",
29+
"moment": "^2.29.4",
3030
"node-sass": "^6.0.1",
3131
"nodemon": "^2.0.2",
3232
"numeral": "^2.0.6",

‎frontend/yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,9 +1501,9 @@ browserslist@^3.2.6:
15011501
electron-to-chromium "^1.3.47"
15021502

15031503
buffer-from@^1.0.0:
1504-
version "1.1.1"
1505-
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
1506-
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
1504+
version "1.1.2"
1505+
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
1506+
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
15071507

15081508
buffer-xor@^1.0.3:
15091509
version "1.0.3"
@@ -4433,10 +4433,10 @@ mkdirp@^1.0.3:
44334433
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
44344434
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
44354435

4436-
moment@^2.24.0:
4437-
version "2.27.0"
4438-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
4439-
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
4436+
moment@^2.29.4:
4437+
version "2.29.4"
4438+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
4439+
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
44404440

44414441
move-concurrently@^1.0.1:
44424442
version "1.0.1"
@@ -5863,9 +5863,9 @@ source-map-support@^0.4.15:
58635863
source-map "^0.5.6"
58645864

58655865
source-map-support@~0.5.12:
5866-
version "0.5.19"
5867-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
5868-
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
5866+
version "0.5.21"
5867+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
5868+
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
58695869
dependencies:
58705870
buffer-from "^1.0.0"
58715871
source-map "^0.6.0"
@@ -6214,9 +6214,9 @@ terser-webpack-plugin@^1.4.3:
62146214
worker-farm "^1.7.0"
62156215

62166216
terser@^4.1.2, terser@^4.6.3:
6217-
version "4.8.0"
6218-
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
6219-
integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
6217+
version "4.8.1"
6218+
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
6219+
integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
62206220
dependencies:
62216221
commander "^2.20.0"
62226222
source-map "~0.6.1"

‎global/certbot-dns-plugins.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ dns_desec_endpoint = https://desec.io/api/v1/`,
147147
duckdns: {
148148
display_name: 'DuckDNS',
149149
package_name: 'certbot-dns-duckdns',
150-
version_requirement: '~=0.6',
150+
version_requirement: '~=0.9',
151151
dependencies: '',
152152
credentials: 'dns_duckdns_token=your-duckdns-token',
153153
full_plugin_name: 'dns-duckdns',

‎test/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ astral-regex@^1.0.0:
253253
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
254254

255255
async@^3.2.0:
256-
version "3.2.0"
257-
resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
258-
integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
256+
version "3.2.4"
257+
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
258+
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
259259

260260
asynckit@^0.4.0:
261261
version "0.4.0"
@@ -1809,9 +1809,9 @@ mocha@^8.1.1:
18091809
yargs-unparser "1.6.1"
18101810

18111811
moment@^2.27.0:
1812-
version "2.27.0"
1813-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
1814-
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
1812+
version "2.29.4"
1813+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
1814+
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
18151815

18161816
[email protected]:
18171817
version "2.0.0"

0 commit comments

Comments
 (0)