HALF WORK: 2024.12.19

Re-organize file structure.

1 files changed, 3 insertions, 58 deletions

diff --git a/template/nginx/root.conf.template b/template/nginx/root.conf.template
index 21d144c..3f20cf1 100644
--- a/template/nginx/root.conf.template
+++ b/template/nginx/root.conf.template
@@ -13,27 +13,9 @@ server {
         }
 
         proxy_redirect off;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_set_header Host $host;
-        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;
+        include common/proxy-common;
         proxy_pass http://v2ray:10000;
     }
-
-    location /api {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_set_header Host $host;
-        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-api:5000;
-    }
-
 }
 
 server {
@@ -41,43 +23,6 @@ server {
     listen [::]:80;
     server_name ${CRUPEST_DOMAIN};
 
-    location / {
-        return 301 https://$host$request_uri;
-    }
-
-    location /.well-known/acme-challenge {
-        root /srv/acme;
-    }
-}
-
-# For mail temporarily
-# TODO: Make subpath supported in aio.
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name mail.${CRUPEST_DOMAIN};
-    
-    location / {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_set_header Host $host;
-        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://roundcubemail:80/;
-    }
-
-    location /rspamd/ {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_set_header Host $host;
-        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://mailserver:11334/;
-    }
-
-    client_max_body_size 5G;
+    include common/https-redirect;
+    include common/acme-challenge;
 }