mirror of
				https://github.com/NginxProxyManager/nginx-proxy-manager.git
				synced 2025-11-04 09:25:15 +00:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
		@@ -14,7 +14,7 @@
 | 
			
		||||
			"description": "Expansions",
 | 
			
		||||
			"schema": {
 | 
			
		||||
				"type": "string",
 | 
			
		||||
				"enum": ["access_list", "owner", "certificate"]
 | 
			
		||||
				"enum": ["owner", "certificate"]
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	],
 | 
			
		||||
@@ -40,7 +40,8 @@
 | 
			
		||||
										"nginx_online": true,
 | 
			
		||||
										"nginx_err": null
 | 
			
		||||
									},
 | 
			
		||||
									"enabled": true
 | 
			
		||||
									"enabled": true,
 | 
			
		||||
									"certificate_id": 0
 | 
			
		||||
								}
 | 
			
		||||
							]
 | 
			
		||||
						}
 | 
			
		||||
 
 | 
			
		||||
@@ -32,6 +32,9 @@
 | 
			
		||||
						"udp_forwarding": {
 | 
			
		||||
							"$ref": "../../../components/stream-object.json#/properties/udp_forwarding"
 | 
			
		||||
						},
 | 
			
		||||
						"certificate_id": {
 | 
			
		||||
							"$ref": "../../../components/stream-object.json#/properties/certificate_id"
 | 
			
		||||
						},
 | 
			
		||||
						"meta": {
 | 
			
		||||
							"$ref": "../../../components/stream-object.json#/properties/meta"
 | 
			
		||||
						}
 | 
			
		||||
@@ -73,7 +76,8 @@
 | 
			
		||||
									"nickname": "Admin",
 | 
			
		||||
									"avatar": "",
 | 
			
		||||
									"roles": ["admin"]
 | 
			
		||||
								}
 | 
			
		||||
								},
 | 
			
		||||
								"certificate_id": 0
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					},
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,8 @@
 | 
			
		||||
									"nginx_online": true,
 | 
			
		||||
									"nginx_err": null
 | 
			
		||||
								},
 | 
			
		||||
								"enabled": true
 | 
			
		||||
								"enabled": true,
 | 
			
		||||
								"certificate_id": 0
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					},
 | 
			
		||||
 
 | 
			
		||||
@@ -29,56 +29,26 @@
 | 
			
		||||
					"additionalProperties": false,
 | 
			
		||||
					"minProperties": 1,
 | 
			
		||||
					"properties": {
 | 
			
		||||
						"domain_names": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/domain_names"
 | 
			
		||||
						"incoming_port": {
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/incoming_port"
 | 
			
		||||
						},
 | 
			
		||||
						"forward_scheme": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/forward_scheme"
 | 
			
		||||
						"forwarding_host": {
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/forwarding_host"
 | 
			
		||||
						},
 | 
			
		||||
						"forward_host": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/forward_host"
 | 
			
		||||
						"forwarding_port": {
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/forwarding_port"
 | 
			
		||||
						},
 | 
			
		||||
						"forward_port": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/forward_port"
 | 
			
		||||
						"tcp_forwarding": {
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/tcp_forwarding"
 | 
			
		||||
						},
 | 
			
		||||
						"udp_forwarding": {
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/udp_forwarding"
 | 
			
		||||
						},
 | 
			
		||||
						"certificate_id": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/certificate_id"
 | 
			
		||||
						},
 | 
			
		||||
						"ssl_forced": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/ssl_forced"
 | 
			
		||||
						},
 | 
			
		||||
						"hsts_enabled": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/hsts_enabled"
 | 
			
		||||
						},
 | 
			
		||||
						"hsts_subdomains": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/hsts_subdomains"
 | 
			
		||||
						},
 | 
			
		||||
						"http2_support": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/http2_support"
 | 
			
		||||
						},
 | 
			
		||||
						"block_exploits": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/block_exploits"
 | 
			
		||||
						},
 | 
			
		||||
						"caching_enabled": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/caching_enabled"
 | 
			
		||||
						},
 | 
			
		||||
						"allow_websocket_upgrade": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/allow_websocket_upgrade"
 | 
			
		||||
						},
 | 
			
		||||
						"access_list_id": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/access_list_id"
 | 
			
		||||
						},
 | 
			
		||||
						"advanced_config": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/advanced_config"
 | 
			
		||||
						},
 | 
			
		||||
						"enabled": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/enabled"
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/certificate_id"
 | 
			
		||||
						},
 | 
			
		||||
						"meta": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/meta"
 | 
			
		||||
						},
 | 
			
		||||
						"locations": {
 | 
			
		||||
							"$ref": "../../../../components/proxy-host-object.json#/properties/locations"
 | 
			
		||||
							"$ref": "../../../../components/stream-object.json#/properties/meta"
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
@@ -94,42 +64,32 @@
 | 
			
		||||
						"default": {
 | 
			
		||||
							"value": {
 | 
			
		||||
								"id": 1,
 | 
			
		||||
								"created_on": "2024-10-08T23:23:03.000Z",
 | 
			
		||||
								"modified_on": "2024-10-08T23:26:37.000Z",
 | 
			
		||||
								"created_on": "2024-10-09T02:33:45.000Z",
 | 
			
		||||
								"modified_on": "2024-10-09T02:33:45.000Z",
 | 
			
		||||
								"owner_user_id": 1,
 | 
			
		||||
								"domain_names": ["test.example.com"],
 | 
			
		||||
								"forward_host": "192.168.0.10",
 | 
			
		||||
								"forward_port": 8989,
 | 
			
		||||
								"access_list_id": 0,
 | 
			
		||||
								"certificate_id": 0,
 | 
			
		||||
								"ssl_forced": false,
 | 
			
		||||
								"caching_enabled": false,
 | 
			
		||||
								"block_exploits": false,
 | 
			
		||||
								"advanced_config": "",
 | 
			
		||||
								"incoming_port": 9090,
 | 
			
		||||
								"forwarding_host": "router.internal",
 | 
			
		||||
								"forwarding_port": 80,
 | 
			
		||||
								"tcp_forwarding": true,
 | 
			
		||||
								"udp_forwarding": false,
 | 
			
		||||
								"meta": {
 | 
			
		||||
									"nginx_online": true,
 | 
			
		||||
									"nginx_err": null
 | 
			
		||||
								},
 | 
			
		||||
								"allow_websocket_upgrade": false,
 | 
			
		||||
								"http2_support": false,
 | 
			
		||||
								"forward_scheme": "http",
 | 
			
		||||
								"enabled": true,
 | 
			
		||||
								"hsts_enabled": false,
 | 
			
		||||
								"hsts_subdomains": false,
 | 
			
		||||
								"owner": {
 | 
			
		||||
									"id": 1,
 | 
			
		||||
									"created_on": "2024-10-07T22:43:55.000Z",
 | 
			
		||||
									"modified_on": "2024-10-08T12:52:54.000Z",
 | 
			
		||||
									"created_on": "2024-10-09T02:33:16.000Z",
 | 
			
		||||
									"modified_on": "2024-10-09T02:33:16.000Z",
 | 
			
		||||
									"is_deleted": false,
 | 
			
		||||
									"is_disabled": false,
 | 
			
		||||
									"email": "admin@example.com",
 | 
			
		||||
									"name": "Administrator",
 | 
			
		||||
									"nickname": "some guy",
 | 
			
		||||
									"avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm",
 | 
			
		||||
									"nickname": "Admin",
 | 
			
		||||
									"avatar": "",
 | 
			
		||||
									"roles": ["admin"]
 | 
			
		||||
								},
 | 
			
		||||
								"certificate": null,
 | 
			
		||||
								"access_list": null
 | 
			
		||||
								"certificate_id": 0
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					},
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user