Merge pull request #4347 from NginxProxyManager/develop

v2.12.3

backend/models/dead_host.js

@@ -12,11 +12,7 @@ Model.knex(db);
 
 const boolFields = [
 	'is_deleted',
-	'ssl_forced',
-	'http2_support',
 	'enabled',
-	'hsts_enabled',
-	'hsts_subdomains',
 ];
 
 class DeadHost extends Model {

backend/models/stream.js

@@ -8,8 +8,8 @@ const now         = require('./now_helper');
 Model.knex(db);
 
 const boolFields = [
-	'is_deleted',
 	'enabled',
+	'is_deleted',
 	'tcp_forwarding',
 	'udp_forwarding',
 ];

backend/schema/components/proxy-host-object.json

@@ -22,7 +22,8 @@
 		"enabled",
 		"locations",
 		"hsts_enabled",
-		"hsts_subdomains"
+		"hsts_subdomains",
+		"certificate"
 	],
 	"additionalProperties": false,
 	"properties": {

backend/schema/swagger.json

@@ -9,15 +9,6 @@
 			"url": "http://127.0.0.1:81/api"
 		}
 	],
-	"components": {
-		"securitySchemes": {
-			"bearerAuth": {
-				"type": "http",
-				"scheme": "bearer",
-				"bearerFormat": "JWT"
-			}
-		}
-	},
 	"paths": {
 		"/": {
 			"get": {

backend/templates/_location.conf

@@ -2,8 +2,8 @@
     {{ advanced_config }}
 
     proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Scheme $resolved_proto;
+    proxy_set_header X-Forwarded-Scheme $scheme;
-    proxy_set_header X-Forwarded-Proto  $resolved_proto;
+    proxy_set_header X-Forwarded-Proto  $scheme;
     proxy_set_header X-Forwarded-For    $remote_addr;
     proxy_set_header X-Real-IP		$remote_addr;
 

backend/templates/proxy_host.conf

@@ -4,8 +4,6 @@
 
 {% include "_hsts_map.conf" %}
 
-include conf.d/include/resolved_proto_map.conf;
-
 server {
   set $forward_scheme {{ forward_scheme }};
   set $server         "{{ forward_host }}";

docker/rootfs/etc/nginx/conf.d/include/proxy.conf

@@ -1,7 +1,8 @@
 add_header       X-Served-By $host;
 proxy_set_header Host $host;
-proxy_set_header X-Forwarded-Scheme $resolved_proto;
+proxy_set_header X-Forwarded-Scheme $scheme;
-proxy_set_header X-Forwarded-Proto  $resolved_proto;
+proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
 proxy_set_header X-Real-IP          $remote_addr;
 proxy_pass       $forward_scheme://$server:$port$request_uri;
+

docker/rootfs/etc/nginx/conf.d/include/resolved_proto_map.conf

@@ -1,7 +0,0 @@
-# Resolve the effective protocol: use X-Forwarded-Proto if set
-# (e.g., from proxies like Cloudflare or AWS)
-# otherwise fall back to the current scheme.
-map $http_x_forwarded_proto $resolved_proto {
-    default $scheme;
-    ~.+ $http_x_forwarded_proto;
-}