From 14032e72595efc82ad4e1020cd9fbef221063821 Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 16 Feb 2025 22:09:34 +0800 Subject: [PATCH] opt some --- etc/portal/2023-ContextOS/server.conf | 1 + etc/portal/2024-ContextOS/server.conf | 1 + etc/portal/2024-guangdong/server.conf | 3 ++- etc/portal/2024-laoshaojiaju/server.conf | 3 ++- etc/portal/2024-shandong/server.conf | 3 ++- etc/portal/2024-zelinqiche/server.conf | 3 ++- etc/portal/2025-ContextOS/server.conf | 1 + etc/portal/2025-beijing-1/server.conf | 3 ++- etc/portal/2025-beijing-2/server.conf | 3 ++- etc/portal/2025-beijing-3/server.conf | 3 ++- etc/portal/2025-cluster/location.conf | 9 +++++++++ etc/portal/2025-cluster/server.conf | 11 +++++++++++ etc/portal/2025-cluster/upstream.conf | 3 +++ etc/portal/2025-dev/server.conf | 3 ++- etc/portal/2025-foundation/server.conf | 3 ++- etc/portal/2025-git/server.conf | 3 ++- etc/portal/2025-guangzhou-1/server.conf | 3 ++- etc/portal/2025-guangzhou-2/server.conf | 3 ++- etc/portal/2025-guangzhou-3/server.conf | 3 ++- etc/portal/2025-machine/location.conf | 9 +++++++++ etc/portal/2025-machine/server.conf | 11 +++++++++++ etc/portal/2025-machine/upstream.conf | 3 +++ etc/portal/2025-machine2/location.conf | 9 +++++++++ etc/portal/2025-machine2/server.conf | 11 +++++++++++ etc/portal/2025-machine2/upstream.conf | 3 +++ etc/portal/2025-pod/server.conf | 3 ++- etc/portal/2025-shanghai-1/server.conf | 3 ++- etc/portal/2025-shanghai-2/server.conf | 3 ++- etc/portal/2025-shanghai-3/server.conf | 3 ++- etc/portal/2025-support/server.conf | 3 ++- 30 files changed, 108 insertions(+), 18 deletions(-) create mode 100644 etc/portal/2025-cluster/location.conf create mode 100644 etc/portal/2025-cluster/server.conf create mode 100644 etc/portal/2025-cluster/upstream.conf create mode 100644 etc/portal/2025-machine/location.conf create mode 100644 etc/portal/2025-machine/server.conf create mode 100644 etc/portal/2025-machine/upstream.conf create mode 100644 etc/portal/2025-machine2/location.conf create mode 100644 etc/portal/2025-machine2/server.conf create mode 100644 etc/portal/2025-machine2/upstream.conf diff --git a/etc/portal/2023-ContextOS/server.conf b/etc/portal/2023-ContextOS/server.conf index ad240cd3..84615931 100644 --- a/etc/portal/2023-ContextOS/server.conf +++ b/etc/portal/2023-ContextOS/server.conf @@ -7,4 +7,5 @@ server { listen 80; server_name 2023-ContextOS.shylinux.com; include location/tohttps.conf; + # include portal/2023-ContextOS/location.conf; } diff --git a/etc/portal/2024-ContextOS/server.conf b/etc/portal/2024-ContextOS/server.conf index 49ff66de..eadba567 100644 --- a/etc/portal/2024-ContextOS/server.conf +++ b/etc/portal/2024-ContextOS/server.conf @@ -7,4 +7,5 @@ server { listen 80; server_name 2024-ContextOS.shylinux.com; include location/tohttps.conf; + # include portal/2024-ContextOS/location.conf; } diff --git a/etc/portal/2024-guangdong/server.conf b/etc/portal/2024-guangdong/server.conf index 4ea5d19d..6e55c9f7 100644 --- a/etc/portal/2024-guangdong/server.conf +++ b/etc/portal/2024-guangdong/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2024-guangdong.shylinux.com; - include location/tohttps.conf; + include portal/2024-guangdong/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2024-laoshaojiaju/server.conf b/etc/portal/2024-laoshaojiaju/server.conf index 0626436e..b612d13c 100644 --- a/etc/portal/2024-laoshaojiaju/server.conf +++ b/etc/portal/2024-laoshaojiaju/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2024-laoshaojiaju.shylinux.com; - include location/tohttps.conf; + include portal/2024-laoshaojiaju/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2024-shandong/server.conf b/etc/portal/2024-shandong/server.conf index 7b2fa5b0..42898fbd 100644 --- a/etc/portal/2024-shandong/server.conf +++ b/etc/portal/2024-shandong/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2024-shandong.shylinux.com; - include location/tohttps.conf; + include portal/2024-shandong/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2024-zelinqiche/server.conf b/etc/portal/2024-zelinqiche/server.conf index 030409df..fe396515 100644 --- a/etc/portal/2024-zelinqiche/server.conf +++ b/etc/portal/2024-zelinqiche/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2024-zelinqiche.shylinux.com; - include location/tohttps.conf; + include portal/2024-zelinqiche/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-ContextOS/server.conf b/etc/portal/2025-ContextOS/server.conf index 2e634f10..d49970cf 100644 --- a/etc/portal/2025-ContextOS/server.conf +++ b/etc/portal/2025-ContextOS/server.conf @@ -7,4 +7,5 @@ server { listen 80; server_name 2025-ContextOS.shylinux.com; include location/tohttps.conf; + # include portal/2025-ContextOS/location.conf; } diff --git a/etc/portal/2025-beijing-1/server.conf b/etc/portal/2025-beijing-1/server.conf index bebd5f65..0691eb91 100644 --- a/etc/portal/2025-beijing-1/server.conf +++ b/etc/portal/2025-beijing-1/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-beijing-1.shylinux.com; - include location/tohttps.conf; + include portal/2025-beijing-1/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-beijing-2/server.conf b/etc/portal/2025-beijing-2/server.conf index eedc71cb..f4327a86 100644 --- a/etc/portal/2025-beijing-2/server.conf +++ b/etc/portal/2025-beijing-2/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-beijing-2.shylinux.com; - include location/tohttps.conf; + include portal/2025-beijing-2/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-beijing-3/server.conf b/etc/portal/2025-beijing-3/server.conf index 31f2a26a..8b323bc4 100644 --- a/etc/portal/2025-beijing-3/server.conf +++ b/etc/portal/2025-beijing-3/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-beijing-3.shylinux.com; - include location/tohttps.conf; + include portal/2025-beijing-3/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-cluster/location.conf b/etc/portal/2025-cluster/location.conf new file mode 100644 index 00000000..bf498c90 --- /dev/null +++ b/etc/portal/2025-cluster/location.conf @@ -0,0 +1,9 @@ +location / { + include header/proxy.conf; + proxy_pass http://2025-cluster; +} +location /space/ { + include header/proxy.conf; + include header/websocket.conf; + proxy_pass http://2025-cluster; +} diff --git a/etc/portal/2025-cluster/server.conf b/etc/portal/2025-cluster/server.conf new file mode 100644 index 00000000..6488a659 --- /dev/null +++ b/etc/portal/2025-cluster/server.conf @@ -0,0 +1,11 @@ +server { + listen 443 ssl; + server_name 2025-cluster.shylinux.com; + include portal/2025-cluster/location.conf; +} +server { + listen 80; + server_name 2025-cluster.shylinux.com; + include portal/2025-cluster/location.conf; + # include location/tohttps.conf; +} diff --git a/etc/portal/2025-cluster/upstream.conf b/etc/portal/2025-cluster/upstream.conf new file mode 100644 index 00000000..d0a4c620 --- /dev/null +++ b/etc/portal/2025-cluster/upstream.conf @@ -0,0 +1,3 @@ +upstream 2025-cluster { + server 127.0.0.1:40000; +} diff --git a/etc/portal/2025-dev/server.conf b/etc/portal/2025-dev/server.conf index 6e616054..60a9121b 100644 --- a/etc/portal/2025-dev/server.conf +++ b/etc/portal/2025-dev/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-dev.shylinux.com; - include location/tohttps.conf; + include portal/2025-dev/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-foundation/server.conf b/etc/portal/2025-foundation/server.conf index 63b40bf1..f7520135 100644 --- a/etc/portal/2025-foundation/server.conf +++ b/etc/portal/2025-foundation/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-foundation.shylinux.com; - include location/tohttps.conf; + include portal/2025-foundation/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-git/server.conf b/etc/portal/2025-git/server.conf index 97b7b2a6..fb4deae8 100644 --- a/etc/portal/2025-git/server.conf +++ b/etc/portal/2025-git/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-git.shylinux.com; - include location/tohttps.conf; + include portal/2025-git/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-guangzhou-1/server.conf b/etc/portal/2025-guangzhou-1/server.conf index 8fd4497a..6e4e9d7d 100644 --- a/etc/portal/2025-guangzhou-1/server.conf +++ b/etc/portal/2025-guangzhou-1/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-guangzhou-1.shylinux.com; - include location/tohttps.conf; + include portal/2025-guangzhou-1/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-guangzhou-2/server.conf b/etc/portal/2025-guangzhou-2/server.conf index 157d402b..7a34eb41 100644 --- a/etc/portal/2025-guangzhou-2/server.conf +++ b/etc/portal/2025-guangzhou-2/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-guangzhou-2.shylinux.com; - include location/tohttps.conf; + include portal/2025-guangzhou-2/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-guangzhou-3/server.conf b/etc/portal/2025-guangzhou-3/server.conf index 073de9ba..a3f60c8d 100644 --- a/etc/portal/2025-guangzhou-3/server.conf +++ b/etc/portal/2025-guangzhou-3/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-guangzhou-3.shylinux.com; - include location/tohttps.conf; + include portal/2025-guangzhou-3/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-machine/location.conf b/etc/portal/2025-machine/location.conf new file mode 100644 index 00000000..81f3d439 --- /dev/null +++ b/etc/portal/2025-machine/location.conf @@ -0,0 +1,9 @@ +location / { + include header/proxy.conf; + proxy_pass http://2025-machine; +} +location /space/ { + include header/proxy.conf; + include header/websocket.conf; + proxy_pass http://2025-machine; +} diff --git a/etc/portal/2025-machine/server.conf b/etc/portal/2025-machine/server.conf new file mode 100644 index 00000000..1fc6fb64 --- /dev/null +++ b/etc/portal/2025-machine/server.conf @@ -0,0 +1,11 @@ +server { + listen 443 ssl; + server_name 2025-machine.shylinux.com; + include portal/2025-machine/location.conf; +} +server { + listen 80; + server_name 2025-machine.shylinux.com; + include portal/2025-machine/location.conf; + # include location/tohttps.conf; +} diff --git a/etc/portal/2025-machine/upstream.conf b/etc/portal/2025-machine/upstream.conf new file mode 100644 index 00000000..a5d2e0e1 --- /dev/null +++ b/etc/portal/2025-machine/upstream.conf @@ -0,0 +1,3 @@ +upstream 2025-machine { + server 127.0.0.1:40001; +} diff --git a/etc/portal/2025-machine2/location.conf b/etc/portal/2025-machine2/location.conf new file mode 100644 index 00000000..db145bbe --- /dev/null +++ b/etc/portal/2025-machine2/location.conf @@ -0,0 +1,9 @@ +location / { + include header/proxy.conf; + proxy_pass http://2025-machine2; +} +location /space/ { + include header/proxy.conf; + include header/websocket.conf; + proxy_pass http://2025-machine2; +} diff --git a/etc/portal/2025-machine2/server.conf b/etc/portal/2025-machine2/server.conf new file mode 100644 index 00000000..b60a3a56 --- /dev/null +++ b/etc/portal/2025-machine2/server.conf @@ -0,0 +1,11 @@ +server { + listen 443 ssl; + server_name 2025-machine2.shylinux.com; + include portal/2025-machine2/location.conf; +} +server { + listen 80; + server_name 2025-machine2.shylinux.com; + include portal/2025-machine2/location.conf; + # include location/tohttps.conf; +} diff --git a/etc/portal/2025-machine2/upstream.conf b/etc/portal/2025-machine2/upstream.conf new file mode 100644 index 00000000..0ffdfc5b --- /dev/null +++ b/etc/portal/2025-machine2/upstream.conf @@ -0,0 +1,3 @@ +upstream 2025-machine2 { + server 127.0.0.1:40002; +} diff --git a/etc/portal/2025-pod/server.conf b/etc/portal/2025-pod/server.conf index 399c30c1..1df2e22e 100644 --- a/etc/portal/2025-pod/server.conf +++ b/etc/portal/2025-pod/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-pod.shylinux.com; - include location/tohttps.conf; + include portal/2025-pod/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-shanghai-1/server.conf b/etc/portal/2025-shanghai-1/server.conf index fdb75814..af23cb5a 100644 --- a/etc/portal/2025-shanghai-1/server.conf +++ b/etc/portal/2025-shanghai-1/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-shanghai-1.shylinux.com; - include location/tohttps.conf; + include portal/2025-shanghai-1/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-shanghai-2/server.conf b/etc/portal/2025-shanghai-2/server.conf index 6190a0af..1bc3cf95 100644 --- a/etc/portal/2025-shanghai-2/server.conf +++ b/etc/portal/2025-shanghai-2/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-shanghai-2.shylinux.com; - include location/tohttps.conf; + include portal/2025-shanghai-2/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-shanghai-3/server.conf b/etc/portal/2025-shanghai-3/server.conf index c07a0240..01bdb080 100644 --- a/etc/portal/2025-shanghai-3/server.conf +++ b/etc/portal/2025-shanghai-3/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-shanghai-3.shylinux.com; - include location/tohttps.conf; + include portal/2025-shanghai-3/location.conf; + # include location/tohttps.conf; } diff --git a/etc/portal/2025-support/server.conf b/etc/portal/2025-support/server.conf index 488d48cc..e339ce02 100644 --- a/etc/portal/2025-support/server.conf +++ b/etc/portal/2025-support/server.conf @@ -6,5 +6,6 @@ server { server { listen 80; server_name 2025-support.shylinux.com; - include location/tohttps.conf; + include portal/2025-support/location.conf; + # include location/tohttps.conf; }