diff options
| -rw-r--r-- | template/nginx/reverse-proxy.conf.template | 6 | ||||
| -rw-r--r-- | template/nginx/server.json | 10 | ||||
| -rw-r--r-- | template/nginx/server.schema.json | 42 | ||||
| -rw-r--r-- | template/nginx/server.ts | 5 | ||||
| -rwxr-xr-x | tool/modules/nginx.py | 3 |
5 files changed, 21 insertions, 45 deletions
diff --git a/template/nginx/reverse-proxy.conf.template b/template/nginx/reverse-proxy.conf.template index 4cb8b33..01442ab 100644 --- a/template/nginx/reverse-proxy.conf.template +++ b/template/nginx/reverse-proxy.conf.template @@ -1,7 +1,3 @@ -upstream ${CRUPEST_NGINX_UPSTREAM_NAME} { - server ${CRUPEST_NGINX_UPSTREAM_SERVER}; -} - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -15,7 +11,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Real-IP $remote_addr; - proxy_pass http://${CRUPEST_NGINX_UPSTREAM_NAME}; + proxy_pass http://${CRUPEST_NGINX_UPSTREAM_SERVER}; } client_max_body_size 5G; diff --git a/template/nginx/server.json b/template/nginx/server.json index 459e74e..af48eb4 100644 --- a/template/nginx/server.json +++ b/template/nginx/server.json @@ -4,18 +4,12 @@ { "type": "reverse-proxy", "subdomain": "code", - "upstream": { - "name": "code-server", - "server": "code-server:8080" - } + "upstream": "code-server:8080" }, { "type": "reverse-proxy", "subdomain": "timeline", - "upstream": { - "name": "timeline", - "server": "timeline:5000" - } + "upstream": "timeline:5000" }, { "type": "static-file", diff --git a/template/nginx/server.schema.json b/template/nginx/server.schema.json index 5923b0a..c3bc7c0 100644 --- a/template/nginx/server.schema.json +++ b/template/nginx/server.schema.json @@ -44,35 +44,11 @@ "type": "string" }, "upstream": { - "properties": { - "name": { - "type": "string" - }, - "server": { - "type": "string" - } - }, - "type": "object" + "type": "string" } }, "type": "object" }, - "Site": { - "anyOf": [ - { - "$ref": "#/definitions/ReverseProxySite" - }, - { - "$ref": "#/definitions/StaticFileSite" - }, - { - "$ref": "#/definitions/RedirectSite" - }, - { - "$ref": "#/definitions/CertOnlySite" - } - ] - }, "StaticFileSite": { "properties": { "root": { @@ -94,10 +70,24 @@ "properties": { "sites": { "items": { - "$ref": "#/definitions/Site" + "anyOf": [ + { + "$ref": "#/definitions/ReverseProxySite" + }, + { + "$ref": "#/definitions/StaticFileSite" + }, + { + "$ref": "#/definitions/RedirectSite" + }, + { + "$ref": "#/definitions/CertOnlySite" + } + ] }, "type": "array" } }, "type": "object" } + diff --git a/template/nginx/server.ts b/template/nginx/server.ts index 0fad6f5..368e5ff 100644 --- a/template/nginx/server.ts +++ b/template/nginx/server.ts @@ -3,10 +3,7 @@ export interface ReverseProxySite { type: "reverse-proxy"; subdomain: string; - upstream: { - name: string; - server: string; - }; + upstream: string; } export interface StaticFileSite { diff --git a/tool/modules/nginx.py b/tool/modules/nginx.py index db350a7..f69c5df 100755 --- a/tool/modules/nginx.py +++ b/tool/modules/nginx.py @@ -83,8 +83,7 @@ def generate_nginx_config(domain: str, original_config, dest: str) -> None: local_config['CRUPEST_NGINX_ROOT'] = site["root"] elif site["type"] == 'reverse-proxy': template = reverse_proxy_template - local_config['CRUPEST_NGINX_UPSTREAM_NAME'] = site["upstream"]["name"] - local_config['CRUPEST_NGINX_UPSTREAM_SERVER'] = site["upstream"]["server"] + local_config['CRUPEST_NGINX_UPSTREAM_SERVER'] = site["upstream"] elif site["type"] == 'redirect': template = redirect_template local_config['CRUPEST_NGINX_URL'] = site["url"] |