Merge 660caa41db into 79d28f03d0

API Schema Improvements

backend/models/dead_host.js

@@ -12,7 +12,11 @@ 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 = [
-	'enabled',
 	'is_deleted',
+	'enabled',
 	'tcp_forwarding',
 	'udp_forwarding',
 ];

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

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

backend/schema/swagger.json

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

backend/templates/dead_host.conf

@@ -10,8 +10,8 @@ server {
 {% include "_hsts.conf" %}
 {% include "_forced_ssl.conf" %}
 
-  access_log /data/logs/dead-host-{{ id }}_access.log standard;
+  access_log /data/logs/dead-host-{{ domain_names | first }}_access.log standard;
-  error_log /data/logs/dead-host-{{ id }}_error.log warn;
+  error_log /data/logs/dead-host-{{ domain_names | first }}_error.log warn;
 
 {{ advanced_config }}
 

backend/templates/proxy_host.conf

@@ -22,8 +22,8 @@ proxy_set_header Connection $http_connection;
 proxy_http_version 1.1;
 {% endif %}
 
-  access_log /data/logs/proxy-host-{{ id }}_access.log proxy;
+  access_log /data/logs/proxy-host-{{ domain_names | first }}_access.log proxy;
-  error_log /data/logs/proxy-host-{{ id }}_error.log warn;
+  error_log /data/logs/proxy-host-{{ domain_names | first }}_error.log warn;
 
 {{ advanced_config }}
 

backend/templates/redirection_host.conf

@@ -12,8 +12,8 @@ server {
 {% include "_hsts.conf" %}
 {% include "_forced_ssl.conf" %}
 
-  access_log /data/logs/redirection-host-{{ id }}_access.log standard;
+  access_log /data/logs/redirection-host-{{ domain_names | first }}_access.log standard;
-  error_log /data/logs/redirection-host-{{ id }}_error.log warn;
+  error_log /data/logs/redirection-host-{{ domain_names | first }}_error.log warn;
 
 {{ advanced_config }}