Merge pull request #4347 from NginxProxyManager/develop

v2.12.3

backend/internal/nginx.js

@@ -235,19 +235,6 @@ const internalNginx = {
 			// Set the IPv6 setting for the host
 			host.ipv6 = internalNginx.ipv6Enabled();
 
-			
-			if ( nice_host_type === 'proxy_host' ) {			
-				let listen_ports = [];
-				host.domain_names.map( function (domain_name) {
-					if ( domain_name.indexOf(':') > 0 ){
-						listen_ports.push(parseInt(domain_name.substring(domain_name.indexOf(':')+1)));
-					}
-				});
-				if ( listen_ports.length > 0 ){
-					host.listen_ports = listen_ports;
-				}
-			}
-
 			locationsPromise.then(() => {
 				renderEngine
 					.parseAndRender(template, host)

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/_listen.conf

@@ -12,9 +12,6 @@
   #listen [::]:443;
 {% endif %}
 {% endif %}
-{% for listen_port in listen_ports %}
-  listen listen_port;
-{% endfor %}
   server_name {{ domain_names | join: " " }};
 {% if http2_support == 1 or http2_support == true %}
   http2 on;

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

@@ -1,5 +1,5 @@
 add_header       X-Served-By $host;
-proxy_set_header Host $http_host;
+proxy_set_header Host $host;
 proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;