From 956b5affb2948ae7134a8ab2b608059b33868722 Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 16 Feb 2025 08:23:55 +0800 Subject: [PATCH] opt some --- etc/portal/2016/server.conf | 3 +-- etc/portal/2021/server.conf | 3 +-- etc/portal/2022/server.conf | 3 +-- etc/portal/2023-ContextOS/server.conf | 3 +-- etc/portal/2023/server.conf | 3 +-- etc/portal/2024-ContextOS/server.conf | 3 +-- etc/portal/2024-guangdong/server.conf | 3 +-- etc/portal/2024-jingganjiaoyu/server.conf | 3 +-- etc/portal/2024-jingganjiaoyu/upstream.conf | 2 +- etc/portal/2024-laoshaojiaju/server.conf | 3 +-- etc/portal/2024-shandong/server.conf | 3 +-- etc/portal/2024-yunxuanlinghang/server.conf | 3 +-- etc/portal/2024-yunxuanlinghang/upstream.conf | 2 +- etc/portal/2024-zelinqiche/server.conf | 3 +-- etc/portal/2024/server.conf | 3 +-- etc/portal/2025-ContextOS/server.conf | 3 +-- etc/portal/2025-bbs/server.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-pod/server.conf | 3 +-- etc/portal/2025-support/server.conf | 3 +-- etc/portal/2025-web/server.conf | 3 +-- etc/portal/2025/server.conf | 3 +-- etc/portal/bbs/server.conf | 3 +-- etc/portal/demo/server.conf | 3 +-- etc/portal/demo/upstream.conf | 2 +- etc/portal/dev/server.conf | 3 +-- etc/portal/foundation/server.conf | 3 +-- etc/portal/git/server.conf | 3 +-- etc/portal/h15/server.conf | 3 +-- etc/portal/pod/server.conf | 3 +-- etc/portal/shylinux/server.conf | 4 +--- etc/portal/support/server.conf | 3 +-- etc/portal/web/server.conf | 3 +-- 35 files changed, 35 insertions(+), 68 deletions(-) diff --git a/etc/portal/2016/server.conf b/etc/portal/2016/server.conf index 90febca8..93512345 100644 --- a/etc/portal/2016/server.conf +++ b/etc/portal/2016/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2016.shylinux.com; - include portal/2016/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2021/server.conf b/etc/portal/2021/server.conf index e28fe1b8..55c57934 100644 --- a/etc/portal/2021/server.conf +++ b/etc/portal/2021/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2021.shylinux.com; - include portal/2021/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2022/server.conf b/etc/portal/2022/server.conf index caf29c33..95d46a1b 100644 --- a/etc/portal/2022/server.conf +++ b/etc/portal/2022/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2022.shylinux.com; - include portal/2022/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2023-ContextOS/server.conf b/etc/portal/2023-ContextOS/server.conf index 34e1289a..ad240cd3 100644 --- a/etc/portal/2023-ContextOS/server.conf +++ b/etc/portal/2023-ContextOS/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2023-ContextOS.shylinux.com; - include portal/2023-ContextOS/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2023/server.conf b/etc/portal/2023/server.conf index 08badaa8..95348f78 100644 --- a/etc/portal/2023/server.conf +++ b/etc/portal/2023/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2023.shylinux.com; - include portal/2023/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-ContextOS/server.conf b/etc/portal/2024-ContextOS/server.conf index 89fe5a4b..49ff66de 100644 --- a/etc/portal/2024-ContextOS/server.conf +++ b/etc/portal/2024-ContextOS/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-ContextOS.shylinux.com; - include portal/2024-ContextOS/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-guangdong/server.conf b/etc/portal/2024-guangdong/server.conf index 6e55c9f7..4ea5d19d 100644 --- a/etc/portal/2024-guangdong/server.conf +++ b/etc/portal/2024-guangdong/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-guangdong.shylinux.com; - include portal/2024-guangdong/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-jingganjiaoyu/server.conf b/etc/portal/2024-jingganjiaoyu/server.conf index a380ab55..74300704 100644 --- a/etc/portal/2024-jingganjiaoyu/server.conf +++ b/etc/portal/2024-jingganjiaoyu/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-jingganjiaoyu.shylinux.com; - include portal/2024-jingganjiaoyu/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-jingganjiaoyu/upstream.conf b/etc/portal/2024-jingganjiaoyu/upstream.conf index faad4d7e..d4f941ff 100644 --- a/etc/portal/2024-jingganjiaoyu/upstream.conf +++ b/etc/portal/2024-jingganjiaoyu/upstream.conf @@ -1,3 +1,3 @@ upstream 2024-jingganjiaoyu { - server 49.232.11.57:9045; + server jingganjiaoyu.com; } diff --git a/etc/portal/2024-laoshaojiaju/server.conf b/etc/portal/2024-laoshaojiaju/server.conf index b612d13c..0626436e 100644 --- a/etc/portal/2024-laoshaojiaju/server.conf +++ b/etc/portal/2024-laoshaojiaju/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-laoshaojiaju.shylinux.com; - include portal/2024-laoshaojiaju/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-shandong/server.conf b/etc/portal/2024-shandong/server.conf index 42898fbd..7b2fa5b0 100644 --- a/etc/portal/2024-shandong/server.conf +++ b/etc/portal/2024-shandong/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-shandong.shylinux.com; - include portal/2024-shandong/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-yunxuanlinghang/server.conf b/etc/portal/2024-yunxuanlinghang/server.conf index 30539ada..5aa2cdb5 100644 --- a/etc/portal/2024-yunxuanlinghang/server.conf +++ b/etc/portal/2024-yunxuanlinghang/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-yunxuanlinghang.shylinux.com; - include portal/2024-yunxuanlinghang/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024-yunxuanlinghang/upstream.conf b/etc/portal/2024-yunxuanlinghang/upstream.conf index 0af3aa49..3b2c5da4 100644 --- a/etc/portal/2024-yunxuanlinghang/upstream.conf +++ b/etc/portal/2024-yunxuanlinghang/upstream.conf @@ -1,3 +1,3 @@ upstream 2024-yunxuanlinghang { - server 111.230.17.159:9046; + server yunxuanlinghang.com; } diff --git a/etc/portal/2024-zelinqiche/server.conf b/etc/portal/2024-zelinqiche/server.conf index fe396515..030409df 100644 --- a/etc/portal/2024-zelinqiche/server.conf +++ b/etc/portal/2024-zelinqiche/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024-zelinqiche.shylinux.com; - include portal/2024-zelinqiche/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2024/server.conf b/etc/portal/2024/server.conf index 56dda424..6f47a76a 100644 --- a/etc/portal/2024/server.conf +++ b/etc/portal/2024/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2024.shylinux.com; - include portal/2024/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-ContextOS/server.conf b/etc/portal/2025-ContextOS/server.conf index f4652c8f..2e634f10 100644 --- a/etc/portal/2025-ContextOS/server.conf +++ b/etc/portal/2025-ContextOS/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-ContextOS.shylinux.com; - include portal/2025-ContextOS/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-bbs/server.conf b/etc/portal/2025-bbs/server.conf index 11515d5a..e0a1a490 100644 --- a/etc/portal/2025-bbs/server.conf +++ b/etc/portal/2025-bbs/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-bbs.shylinux.com; - include portal/2025-bbs/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-dev/server.conf b/etc/portal/2025-dev/server.conf index 60a9121b..6e616054 100644 --- a/etc/portal/2025-dev/server.conf +++ b/etc/portal/2025-dev/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-dev.shylinux.com; - include portal/2025-dev/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-foundation/server.conf b/etc/portal/2025-foundation/server.conf index f7520135..63b40bf1 100644 --- a/etc/portal/2025-foundation/server.conf +++ b/etc/portal/2025-foundation/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-foundation.shylinux.com; - include portal/2025-foundation/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-git/server.conf b/etc/portal/2025-git/server.conf index fb4deae8..97b7b2a6 100644 --- a/etc/portal/2025-git/server.conf +++ b/etc/portal/2025-git/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-git.shylinux.com; - include portal/2025-git/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-pod/server.conf b/etc/portal/2025-pod/server.conf index 1df2e22e..399c30c1 100644 --- a/etc/portal/2025-pod/server.conf +++ b/etc/portal/2025-pod/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-pod.shylinux.com; - include portal/2025-pod/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-support/server.conf b/etc/portal/2025-support/server.conf index e339ce02..488d48cc 100644 --- a/etc/portal/2025-support/server.conf +++ b/etc/portal/2025-support/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-support.shylinux.com; - include portal/2025-support/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025-web/server.conf b/etc/portal/2025-web/server.conf index af1baab4..2bf139fc 100644 --- a/etc/portal/2025-web/server.conf +++ b/etc/portal/2025-web/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025-web.shylinux.com; - include portal/2025-web/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/2025/server.conf b/etc/portal/2025/server.conf index 94d8b1c4..3cdba79b 100644 --- a/etc/portal/2025/server.conf +++ b/etc/portal/2025/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name 2025.shylinux.com; - include portal/2025/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/bbs/server.conf b/etc/portal/bbs/server.conf index 48f80e06..717bd69d 100644 --- a/etc/portal/bbs/server.conf +++ b/etc/portal/bbs/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name bbs.shylinux.com; - include portal/bbs/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/demo/server.conf b/etc/portal/demo/server.conf index 253ed7a2..712331cb 100644 --- a/etc/portal/demo/server.conf +++ b/etc/portal/demo/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name demo.shylinux.com; - include portal/demo/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/demo/upstream.conf b/etc/portal/demo/upstream.conf index 7659f841..f0966e7c 100644 --- a/etc/portal/demo/upstream.conf +++ b/etc/portal/demo/upstream.conf @@ -1,3 +1,3 @@ upstream demo { - server 127.0.0.1:20076; + server 127.0.0.1:20000; } diff --git a/etc/portal/dev/server.conf b/etc/portal/dev/server.conf index 94f74f43..f6142e03 100644 --- a/etc/portal/dev/server.conf +++ b/etc/portal/dev/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name dev.shylinux.com; - include portal/dev/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/foundation/server.conf b/etc/portal/foundation/server.conf index bb3f2fb2..f1371ed0 100644 --- a/etc/portal/foundation/server.conf +++ b/etc/portal/foundation/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name foundation.shylinux.com; - include portal/foundation/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/git/server.conf b/etc/portal/git/server.conf index 6b289394..ee2f93db 100644 --- a/etc/portal/git/server.conf +++ b/etc/portal/git/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name git.shylinux.com; - include portal/git/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/h15/server.conf b/etc/portal/h15/server.conf index 2546181a..5e53f702 100644 --- a/etc/portal/h15/server.conf +++ b/etc/portal/h15/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name h15.shylinux.com; - include portal/h15/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/pod/server.conf b/etc/portal/pod/server.conf index 50e4fdd8..52035be9 100644 --- a/etc/portal/pod/server.conf +++ b/etc/portal/pod/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name pod.shylinux.com; - include portal/pod/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/shylinux/server.conf b/etc/portal/shylinux/server.conf index f70c7bf8..a86d5602 100644 --- a/etc/portal/shylinux/server.conf +++ b/etc/portal/shylinux/server.conf @@ -6,7 +6,5 @@ server { server { listen 80; server_name shylinux.com; - location / { - return 307 https://$server_name$request_uri; - } + include location/tohttps.conf; } diff --git a/etc/portal/support/server.conf b/etc/portal/support/server.conf index 00a38b93..0ae6c65a 100644 --- a/etc/portal/support/server.conf +++ b/etc/portal/support/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name support.shylinux.com; - include portal/support/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; } diff --git a/etc/portal/web/server.conf b/etc/portal/web/server.conf index a69da66e..40f5ba16 100644 --- a/etc/portal/web/server.conf +++ b/etc/portal/web/server.conf @@ -6,6 +6,5 @@ server { server { listen 80; server_name web.shylinux.com; - include portal/web/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; }