Merge branch 'zh-v2.11.2' into develop-zh

xiaoxinpro · May 11, 2024 · 8f2be0d · 8f2be0d
2 parents 234194f + 6736c4f
commit 8f2be0d
Show file tree

Hide file tree

Showing 19 changed files with 265 additions and 142 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.11.1
+2.11.2
diff --git a/README-en.md b/README-en.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<img src="https://nginxproxymanager.com/github.png">
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.11.1-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.11.2-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

diff --git a/backend/internal/access-list.js b/backend/internal/access-list.js
@@ -204,7 +204,6 @@ const internalAccessList = {
 						});
 				}
 			})
-			.then(internalNginx.reload)
 			.then(() => {
 				// Add to audit log
 				return internalAuditLog.add(access, {
@@ -227,7 +226,7 @@ const internalAccessList = {
 						if (row.proxy_host_count) {
 							return internalNginx.bulkGenerateConfigs('proxy_host', row.proxy_hosts);
 						}
-					})
+					}).then(internalNginx.reload)
 					.then(() => {
 						return internalAccessList.maskItems(row);
 					});

diff --git a/backend/package.json b/backend/package.json
@@ -10,7 +10,7 @@
 		"bcrypt": "^5.0.0",
 		"body-parser": "^1.19.0",
 		"compression": "^1.7.4",
-		"express": "^4.17.3",
+		"express": "^4.19.2",
 		"express-fileupload": "^1.1.9",
 		"gravatar": "^1.8.0",
 		"json-schema-ref-parser": "^8.0.0",

diff --git a/backend/schema/definitions.json b/backend/schema/definitions.json
@@ -172,7 +172,7 @@
       "description": "Domain Names separated by a comma",
       "example": "*.jc21.com,blog.jc21.com",
       "type": "array",
-      "maxItems": 30,
+      "maxItems": 100,
       "uniqueItems": true,
       "items": {
         "type": "string",

diff --git a/backend/templates/_location.conf b/backend/templates/_location.conf
@@ -1,5 +1,3 @@
-  {% include "_hsts_map.conf" %}
-
   location {{ path }} {
     proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Scheme $scheme;