ccf před 4 roky
rodič
revize
db0e33f906
2 změnil soubory, kde provedl 30 přidání a 15 odebrání
  1. 0 14
      config/caddy/Caddyfile
  2. 30 1
      config/nginx/template/proginn.nginx.conf

+ 0 - 14
config/caddy/Caddyfile

@@ -243,18 +243,4 @@ learn.test.proginn.com {
         }
     }
     reverse_proxy http://10.200.222.231
-}
-
-user.test.proginn.com {
-    tls i@shuncheng.lu {
-        dns dnspod {env.DNSPOD_TOKEN}
-    }
-    log {
-        output file /data/log/access.log {
-            roll_size 10MiB
-            roll_keep 10
-            roll_keep_for 72h
-        }
-    }
-    reverse_proxy http://10.200.222.231
 }

+ 30 - 1
config/nginx/template/proginn.nginx.conf

@@ -438,4 +438,33 @@ server {
         proxy_set_header Host {{domain}}.test.proginn.com;
     }
     access_log /data/log/festival.log proginn-logid;
-}
+}
+
+# 用户模块
+server {
+    listen 80;
+    server_name user.test.proginn.com;
+
+    root /proginn-user/public/;
+    index index.php index.html index.htm;
+
+
+    location / {
+        if (!-e $request_filename) {
+            rewrite  ^(.*)$  /index.php?s=$1  last;
+            break;
+        }
+    }
+    set $temp_request_id $http_x_request_id;
+    if ($temp_request_id = "") {
+        set $temp_request_id $request_id;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass unix:/var/run/php7-fpm.sock;
+        fastcgi_index index.php;
+        include fastcgi_params;
+    }
+
+    access_log /data/log/user_proginn_access.log proginn-logid;
+}