Skip to content

Commit 485bae8

Browse files
jc21jc21
authored
Merge pull request #1064 from jc21/develop
v2.9.0
2 parents 1a64d44 + 6554773 commit 485bae8

File tree

22 files changed

+411
-248
lines changed

22 files changed

+411
-248
lines changed

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.1
1+
2.9.0

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ pipeline {
213213
}
214214
steps {
215215
script {
216-
def comment = pullRequest.comment("Docker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`")
216+
def comment = pullRequest.comment("This is an automated message from CI:\n\nDocker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`\n\n**Note:** ensure you backup your NPM instance before testing this PR image! Especially if this PR contains database changes.")
217217
}
218218
}
219219
}

‎README.md‎

Lines changed: 108 additions & 32 deletions
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.8.1-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.9.0-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>
@@ -63,198 +63,274 @@ Special thanks to the following contributors:
6363
<tr>
6464
<td align="center">
6565
<a href="https://github.com/Subv">
66-
<img src="https://avatars1.githubusercontent.com/u/357072?s=460&u=d8adcdc91d749ae53e177973ed9b6bb6c4c894a3&v=4" width="80px;" alt=""/>
66+
<img src="https://avatars1.githubusercontent.com/u/357072?s=460&u=d8adcdc91d749ae53e177973ed9b6bb6c4c894a3&v=4" width="80" alt=""/>
6767
<br /><sub><b>Sebastian Valle</b></sub>
6868
</a>
6969
</td>
7070
<td align="center">
7171
<a href="https://github.com/Indemnity83">
72-
<img src="https://avatars3.githubusercontent.com/u/35218?s=460&u=7082004ff35138157c868d7d9c683ccebfce5968&v=4" width="80px;" alt=""/>
72+
<img src="https://avatars3.githubusercontent.com/u/35218?s=460&u=7082004ff35138157c868d7d9c683ccebfce5968&v=4" width="80" alt=""/>
7373
<br /><sub><b>Kyle Klaus</b></sub>
7474
</a>
7575
</td>
7676
<td align="center">
7777
<a href="https://github.com/theraw">
78-
<img src="https://avatars1.githubusercontent.com/u/32969774?s=460&u=6b359971e15685fb0359e6a8c065a399b40dc228&v=4" width="80px;" alt=""/>
78+
<img src="https://avatars1.githubusercontent.com/u/32969774?s=460&u=6b359971e15685fb0359e6a8c065a399b40dc228&v=4" width="80" alt=""/>
7979
<br /><sub><b>ƬHE ЯAW</b></sub>
8080
</a>
8181
</td>
8282
<td align="center">
8383
<a href="https://github.com/spalger">
84-
<img src="https://avatars2.githubusercontent.com/u/1329312?s=400&u=565223e38f1c052afb4c5dcca3fcf1c63ba17ae7&v=4" width="80px;" alt=""/>
84+
<img src="https://avatars2.githubusercontent.com/u/1329312?s=400&u=565223e38f1c052afb4c5dcca3fcf1c63ba17ae7&v=4" width="80" alt=""/>
8585
<br /><sub><b>Spencer</b></sub>
8686
</a>
8787
</td>
8888
<td align="center">
8989
<a href="https://github.com/Xantios">
90-
<img src="https://avatars3.githubusercontent.com/u/1507836?s=460&v=4" width="80px;" alt=""/>
90+
<img src="https://avatars3.githubusercontent.com/u/1507836?s=460&v=4" width="80" alt=""/>
9191
<br /><sub><b>Xantios Krugor</b></sub>
9292
</a>
9393
</td>
9494
<td align="center">
9595
<a href="https://github.com/dpanesso">
96-
<img src="https://avatars2.githubusercontent.com/u/2687121?s=460&v=4" width="80px;" alt=""/>
96+
<img src="https://avatars2.githubusercontent.com/u/2687121?s=460&v=4" width="80" alt=""/>
9797
<br /><sub><b>David Panesso</b></sub>
9898
</a>
9999
</td>
100100
<td align="center">
101101
<a href="https://github.com/IronTooch">
102-
<img src="https://avatars3.githubusercontent.com/u/27360514?s=460&u=69bf854a6647c55725f62ecb8d39249c6c0b2602&v=4" width="80px;" alt=""/>
102+
<img src="https://avatars3.githubusercontent.com/u/27360514?s=460&u=69bf854a6647c55725f62ecb8d39249c6c0b2602&v=4" width="80" alt=""/>
103103
<br /><sub><b>IronTooch</b></sub>
104104
</a>
105105
</td>
106106
</tr>
107107
<tr>
108108
<td align="center">
109109
<a href="https://github.com/damianog">
110-
<img src="https://avatars1.githubusercontent.com/u/2786682?s=460&u=76c6136fae797abb76b951cd8a246dcaecaf21af&v=4" width="80px;" alt=""/>
110+
<img src="https://avatars1.githubusercontent.com/u/2786682?s=460&u=76c6136fae797abb76b951cd8a246dcaecaf21af&v=4" width="80" alt=""/>
111111
<br /><sub><b>Damiano</b></sub>
112112
</a>
113113
</td>
114114
<td align="center">
115115
<a href="https://github.com/tfmm">
116-
<img src="https://avatars3.githubusercontent.com/u/6880538?s=460&u=ce0160821cc4aa802df8395200f2d4956a5bc541&v=4" width="80px;" alt=""/>
116+
<img src="https://avatars3.githubusercontent.com/u/6880538?s=460&u=ce0160821cc4aa802df8395200f2d4956a5bc541&v=4" width="80" alt=""/>
117117
<br /><sub><b>Russ</b></sub>
118118
</a>
119119
</td>
120120
<td align="center">
121121
<a href="https://github.com/margaale">
122-
<img src="https://avatars3.githubusercontent.com/u/20794934?s=460&v=4" width="80px;" alt=""/>
122+
<img src="https://avatars3.githubusercontent.com/u/20794934?s=460&v=4" width="80" alt=""/>
123123
<br /><sub><b>Marcelo Castagna</b></sub>
124124
</a>
125125
</td>
126126
<td align="center">
127127
<a href="https://github.com/Steven-Harris">
128-
<img src="https://avatars2.githubusercontent.com/u/7720242?s=460&v=4" width="80px;" alt=""/>
128+
<img src="https://avatars2.githubusercontent.com/u/7720242?s=460&v=4" width="80" alt=""/>
129129
<br /><sub><b>Steven Harris</b></sub>
130130
</a>
131131
</td>
132132
<td align="center">
133133
<a href="https://github.com/jlesage">
134-
<img src="https://avatars0.githubusercontent.com/u/1791123?s=460&v=4" width="80px;" alt=""/>
134+
<img src="https://avatars0.githubusercontent.com/u/1791123?s=460&v=4" width="80" alt=""/>
135135
<br /><sub><b>Jocelyn Le Sage</b></sub>
136136
</a>
137137
</td>
138138
<td align="center">
139139
<a href="https://github.com/cmer">
140-
<img src="https://avatars0.githubusercontent.com/u/412?s=460&u=67dd8b2e3661bfd6f68ec1eaa5b9821bd8a321cd&v=4" width="80px;" alt=""/>
140+
<img src="https://avatars0.githubusercontent.com/u/412?s=460&u=67dd8b2e3661bfd6f68ec1eaa5b9821bd8a321cd&v=4" width="80" alt=""/>
141141
<br /><sub><b>Carl Mercier</b></sub>
142142
</a>
143143
</td>
144144
<td align="center">
145145
<a href="https://github.com/the1ts">
146-
<img src="https://avatars1.githubusercontent.com/u/84956?s=460&v=4" width="80px;" alt=""/>
146+
<img src="https://avatars1.githubusercontent.com/u/84956?s=460&v=4" width="80" alt=""/>
147147
<br /><sub><b>Paul Mansfield</b></sub>
148148
</a>
149149
</td>
150150
</tr>
151151
<tr>
152152
<td align="center">
153153
<a href="https://github.com/OhHeyAlan">
154-
<img src="https://avatars0.githubusercontent.com/u/11955126?s=460&u=fbaa5a1a4f73ef8960132c703349bfd037fe2630&v=4" width="80px;" alt=""/>
154+
<img src="https://avatars0.githubusercontent.com/u/11955126?s=460&u=fbaa5a1a4f73ef8960132c703349bfd037fe2630&v=4" width="80" alt=""/>
155155
<br /><sub><b>OhHeyAlan</b></sub>
156156
</a>
157157
</td>
158158
<td align="center">
159159
<a href="https://github.com/dogmatic69">
160-
<img src="https://avatars2.githubusercontent.com/u/94674?s=460&u=ca7647de53145c6283b6373ade5dc94ba99347db&v=4" width="80px;" alt=""/>
160+
<img src="https://avatars2.githubusercontent.com/u/94674?s=460&u=ca7647de53145c6283b6373ade5dc94ba99347db&v=4" width="80" alt=""/>
161161
<br /><sub><b>Carl Sutton</b></sub>
162162
</a>
163163
</td>
164164
<td align="center">
165165
<a href="https://github.com/tg44">
166-
<img src="https://avatars0.githubusercontent.com/u/31839?s=460&u=ad32f4cadfef5e5fb09cdfa4b7b7b36a99ba6811&v=4" width="80px;" alt=""/>
166+
<img src="https://avatars0.githubusercontent.com/u/31839?s=460&u=ad32f4cadfef5e5fb09cdfa4b7b7b36a99ba6811&v=4" width="80" alt=""/>
167167
<br /><sub><b>Gergő Törcsvári</b></sub>
168168
</a>
169169
</td>
170170
<td align="center">
171171
<a href="https://github.com/vrenjith">
172-
<img src="https://avatars3.githubusercontent.com/u/2093241?s=460&u=96ce93a9bebabdd0a60a2dc96cd093a41d5edaba&v=4" width="80px;" alt=""/>
172+
<img src="https://avatars3.githubusercontent.com/u/2093241?s=460&u=96ce93a9bebabdd0a60a2dc96cd093a41d5edaba&v=4" width="80" alt=""/>
173173
<br /><sub><b>vrenjith</b></sub>
174174
</a>
175175
</td>
176176
<td align="center">
177177
<a href="https://github.com/duhruh">
178-
<img src="https://avatars2.githubusercontent.com/u/1133969?s=460&u=c0691e6131ec6d516416c1c6fcedb5034f877bbe&v=4" width="80px;" alt=""/>
178+
<img src="https://avatars2.githubusercontent.com/u/1133969?s=460&u=c0691e6131ec6d516416c1c6fcedb5034f877bbe&v=4" width="80" alt=""/>
179179
<br /><sub><b>David Rivera</b></sub>
180180
</a>
181181
</td>
182182
<td align="center">
183183
<a href="https://github.com/jipjan">
184-
<img src="https://avatars2.githubusercontent.com/u/1384618?s=460&v=4" width="80px;" alt=""/>
184+
<img src="https://avatars2.githubusercontent.com/u/1384618?s=460&v=4" width="80" alt=""/>
185185
<br /><sub><b>Jaap-Jan de Wit</b></sub>
186186
</a>
187187
</td>
188188
<td align="center">
189189
<a href="https://github.com/jmwebslave">
190-
<img src="https://avatars2.githubusercontent.com/u/6118262?s=460&u=7db409c47135b1e141c366bbb03ed9fae6ac2638&v=4" width="80px;" alt=""/>
190+
<img src="https://avatars2.githubusercontent.com/u/6118262?s=460&u=7db409c47135b1e141c366bbb03ed9fae6ac2638&v=4" width="80" alt=""/>
191191
<br /><sub><b>James Morgan</b></sub>
192192
</a>
193193
</td>
194194
</tr>
195195
<tr>
196196
<td align="center">
197197
<a href="https://github.com/chaptergy">
198-
<img src="https://avatars2.githubusercontent.com/u/26956711?s=460&u=7d9adebabb6b4e7af7cb05d98d751087a372304b&v=4" width="80px;" alt=""/>
198+
<img src="https://avatars2.githubusercontent.com/u/26956711?s=460&u=7d9adebabb6b4e7af7cb05d98d751087a372304b&v=4" width="80" alt=""/>
199199
<br /><sub><b>chaptergy</b></sub>
200200
</a>
201201
</td>
202202
<td align="center">
203203
<a href="https://github.com/Philip-Mooney">
204-
<img src="https://avatars0.githubusercontent.com/u/48624631?s=460&v=4" width="80px;" alt=""/>
204+
<img src="https://avatars0.githubusercontent.com/u/48624631?s=460&v=4" width="80" alt=""/>
205205
<br /><sub><b>Philip Mooney</b></sub>
206206
</a>
207207
</td>
208208
<td align="center">
209209
<a href="https://github.com/WaterCalm">
210-
<img src="https://avatars1.githubusercontent.com/u/23502129?s=400&v=4" width="80px;" alt=""/>
210+
<img src="https://avatars1.githubusercontent.com/u/23502129?s=400&v=4" width="80" alt=""/>
211211
<br /><sub><b>WaterCalm</b></sub>
212212
</a>
213213
</td>
214214
<td align="center">
215215
<a href="https://github.com/lebrou34">
216-
<img src="https://avatars1.githubusercontent.com/u/16373103?s=460&v=4" width="80px;" alt=""/>
216+
<img src="https://avatars1.githubusercontent.com/u/16373103?s=460&v=4" width="80" alt=""/>
217217
<br /><sub><b>lebrou34</b></sub>
218218
</a>
219219
</td>
220220
<td align="center">
221221
<a href="https://github.com/lightglitch">
222-
<img src="https://avatars0.githubusercontent.com/u/196953?s=460&v=4" width="80px;" alt=""/>
222+
<img src="https://avatars0.githubusercontent.com/u/196953?s=460&v=4" width="80" alt=""/>
223223
<br /><sub><b>Mário Franco</b></sub>
224224
</a>
225225
</td>
226226
<td align="center">
227227
<a href="https://github.com/klutchell">
228-
<img src="https://avatars3.githubusercontent.com/u/20458272?s=460&v=4" width="80px;" alt=""/>
228+
<img src="https://avatars3.githubusercontent.com/u/20458272?s=460&v=4" width="80" alt=""/>
229229
<br /><sub><b>Kyle Harding</b></sub>
230230
</a>
231231
</td>
232232
<td align="center">
233233
<a href="https://github.com/ahgraber">
234-
<img src="https://avatars.githubusercontent.com/u/24922003?s=460&u=8376c9f00af9b6057ba4d2fb03b4f1b20a75277f&v=4" width="80px;" alt=""/>
234+
<img src="https://avatars.githubusercontent.com/u/24922003?s=460&u=8376c9f00af9b6057ba4d2fb03b4f1b20a75277f&v=4" width="80" alt=""/>
235235
<br /><sub><b>Alex Graber</b></sub>
236236
</a>
237237
</td>
238238
</tr>
239239
<tr>
240240
<td align="center">
241241
<a href="https://github.com/MooBaloo">
242-
<img src="https://avatars.githubusercontent.com/u/9493496?s=460&v=4" width="80px;" alt=""/>
242+
<img src="https://avatars.githubusercontent.com/u/9493496?s=460&v=4" width="80" alt=""/>
243243
<br /><sub><b>MooBaloo</b></sub>
244244
</a>
245245
</td>
246246
<td align="center">
247247
<a href="https://github.com/Shuro">
248-
<img src="https://avatars.githubusercontent.com/u/944030?s=460&v=4" width="80px;" alt=""/>
248+
<img src="https://avatars.githubusercontent.com/u/944030?s=460&v=4" width="80" alt=""/>
249249
<br /><sub><b>Shuro</b></sub>
250250
</a>
251251
</td>
252252
<td align="center">
253253
<a href="https://github.com/lorisbergeron">
254-
<img src="https://avatars.githubusercontent.com/u/51918567?s=460&u=778e4ff284b7d7304450f98421c99f79298371fb&v=4" width="80px;" alt=""/>
254+
<img src="https://avatars.githubusercontent.com/u/51918567?s=460&u=778e4ff284b7d7304450f98421c99f79298371fb&v=4" width="80" alt=""/>
255255
<br /><sub><b>Loris Bergeron</b></sub>
256256
</a>
257257
</td>
258+
<td align="center">
259+
<a href="https://github.com/hepelayo">
260+
<img src="https://avatars.githubusercontent.com/u/8243119?v=4" width="80" alt=""/>
261+
<br /><sub><b>hepelayo</b></sub>
262+
</a>
263+
</td>
264+
<td align="center">
265+
<a href="https://github.com/jonasled">
266+
<img src="https://avatars.githubusercontent.com/u/46790650?v=4" width="80" alt=""/>
267+
<br /><sub><b>Jonas Leder</b></sub>
268+
</a>
269+
</td>
270+
<td align="center">
271+
<a href="https://github.com/stegmannb">
272+
<img src="https://avatars.githubusercontent.com/u/12850482?v=4" width="80" alt=""/>
273+
<br /><sub><b>Bastian Stegmann</b></sub>
274+
</a>
275+
</td>
276+
<td align="center">
277+
<a href="https://github.com/Stealthii">
278+
<img src="https://avatars.githubusercontent.com/u/998920?v=4" width="80" alt=""/>
279+
<br /><sub><b>Stealthii</b></sub>
280+
</a>
281+
</td>
282+
</tr>
283+
<tr>
284+
<td align="center">
285+
<a href="https://github.com/thegamingninja">
286+
<img src="https://avatars.githubusercontent.com/u/8020534?v=4" width="80" alt=""/>
287+
<br /><sub><b>THEGamingninja</b></sub>
288+
</a>
289+
</td>
290+
<td align="center">
291+
<a href="https://github.com/italobb">
292+
<img src="https://avatars.githubusercontent.com/u/1801687?v=4" width="80" alt=""/>
293+
<br /><sub><b>Italo Borssatto</b></sub>
294+
</a>
295+
</td>
296+
<td align="center">
297+
<a href="https://github.com/GurjinderSingh">
298+
<img src="https://avatars.githubusercontent.com/u/3470709?v=4" width="80" alt=""/>
299+
<br /><sub><b>Gurjinder Singh</b></sub>
300+
</a>
301+
</td>
302+
<td align="center">
303+
<a href="https://github.com/phantomski77">
304+
<img src="https://avatars.githubusercontent.com/u/69464125?v=4" width="80" alt=""/>
305+
<br /><sub><b>David Dosoudil</b></sub>
306+
</a>
307+
</td>
308+
<td align="center">
309+
<a href="https://github.com/ijaron">
310+
<img src="https://avatars.githubusercontent.com/u/5156472?v=4" width="80" alt=""/>
311+
<br /><sub><b>ijaron</b></sub>
312+
</a>
313+
</td>
314+
<td align="center">
315+
<a href="https://github.com/nielscil">
316+
<img src="https://avatars.githubusercontent.com/u/9073152?v=4" width="80" alt=""/>
317+
<br /><sub><b>Niels Bouma</b></sub>
318+
</a>
319+
</td>
320+
<td align="center">
321+
<a href="https://github.com/ogarai">
322+
<img src="https://avatars.githubusercontent.com/u/2949572?v=4" width="80" alt=""/>
323+
<br /><sub><b>Orko Garai</b></sub>
324+
</a>
325+
</td>
326+
</tr>
327+
<tr>
328+
<td align="center">
329+
<a href="https://github.com/baruffaldi">
330+
<img src="https://avatars.githubusercontent.com/u/36949?v=4" width="80" alt=""/>
331+
<br /><sub><b>Filippo Baruffaldi</b></sub>
332+
</a>
333+
</td>
258334
</tr>
259335
</table>
260336
<!-- markdownlint-enable -->

‎backend/internal/certificate.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ const internalCertificate = {
808808
const prepare_cmd = 'pip3 install ' + dns_plugin.package_name + '==' + dns_plugin.package_version + ' ' + dns_plugin.dependencies;
809809

810810
// Whether the plugin has a --<name>-credentials argument
811-
const has_config_arg = certificate.meta.dns_provider !== 'route53';
811+
const has_config_arg = certificate.meta.dns_provider !== 'route53' && certificate.meta.dns_provider !== 'duckdns';
812812

813813
let main_cmd =
814814
certbot_command + ' certonly --non-interactive ' +
@@ -834,6 +834,10 @@ const internalCertificate = {
834834
main_cmd = 'AWS_CONFIG_FILE=\'' + credentials_loc + '\' ' + main_cmd;
835835
}
836836

837+
if (certificate.meta.dns_provider === 'duckdns') {
838+
main_cmd = main_cmd + ' --' + dns_plugin.full_plugin_name + '-token ' + certificate.meta.dns_provider_credentials;
839+
}
840+
837841
if (debug_mode) {
838842
logger.info('Command:', `${credentials_cmd} && ${prepare_cmd} && ${main_cmd}`);
839843
}

‎backend/templates/dead_host.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ server {
55
{% include "_listen.conf" %}
66
{% include "_certificates.conf" %}
77
{% include "_hsts.conf" %}
8+
{% include "_forced_ssl.conf" %}
89

910
access_log /data/logs/dead_host-{{ id }}.log standard;
1011

1112
{{ advanced_config }}
1213

1314
{% if use_default_location %}
1415
location / {
15-
{% include "_forced_ssl.conf" %}
1616
{% include "_hsts.conf" %}
1717
return 404;
1818
}

‎backend/templates/proxy_host.conf‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ server {
1111
{% include "_assets.conf" %}
1212
{% include "_exploits.conf" %}
1313
{% include "_hsts.conf" %}
14+
{% include "_forced_ssl.conf" %}
15+
16+
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
17+
proxy_set_header Upgrade $http_upgrade;
18+
proxy_set_header Connection $http_connection;
19+
proxy_http_version 1.1;
20+
{% endif %}
21+
1422

1523
access_log /data/logs/proxy_host-{{ id }}.log proxy;
1624

@@ -43,15 +51,8 @@ server {
4351

4452
{% endif %}
4553

46-
{% include "_forced_ssl.conf" %}
4754
{% include "_hsts.conf" %}
4855

49-
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
50-
proxy_set_header Upgrade $http_upgrade;
51-
proxy_set_header Connection $http_connection;
52-
proxy_http_version 1.1;
53-
{% endif %}
54-
5556
# Proxy!
5657
include conf.d/include/proxy.conf;
5758
}

0 commit comments

Comments
 (0)