Skip to content

Commit 8f2be0d

Browse files
committed
Merge branch 'zh-v2.11.2' into develop-zh
2 parents 234194f + 6736c4f commit 8f2be0d

File tree

19 files changed

+265
-142
lines changed

19 files changed

+265
-142
lines changed

.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.11.1
1+
2.11.2

README-en.md

+1-1
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.11.1-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.11.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/internal/access-list.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ const internalAccessList = {
204204
});
205205
}
206206
})
207-
.then(internalNginx.reload)
208207
.then(() => {
209208
// Add to audit log
210209
return internalAuditLog.add(access, {
@@ -227,7 +226,7 @@ const internalAccessList = {
227226
if (row.proxy_host_count) {
228227
return internalNginx.bulkGenerateConfigs('proxy_host', row.proxy_hosts);
229228
}
230-
})
229+
}).then(internalNginx.reload)
231230
.then(() => {
232231
return internalAccessList.maskItems(row);
233232
});

backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"bcrypt": "^5.0.0",
1111
"body-parser": "^1.19.0",
1212
"compression": "^1.7.4",
13-
"express": "^4.17.3",
13+
"express": "^4.19.2",
1414
"express-fileupload": "^1.1.9",
1515
"gravatar": "^1.8.0",
1616
"json-schema-ref-parser": "^8.0.0",

backend/schema/definitions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"description": "Domain Names separated by a comma",
173173
"example": "*.jc21.com,blog.jc21.com",
174174
"type": "array",
175-
"maxItems": 30,
175+
"maxItems": 100,
176176
"uniqueItems": true,
177177
"items": {
178178
"type": "string",

backend/templates/_location.conf

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{% include "_hsts_map.conf" %}
2-
31
location {{ path }} {
42
proxy_set_header Host $host;
53
proxy_set_header X-Forwarded-Scheme $scheme;

0 commit comments

Comments
 (0)