From 0be977eb3d0e8c89b85cb443eda95bf8c91eaba6 Mon Sep 17 00:00:00 2001
From: amass <amass.law1996@gmail.com>
Date: Sun, 1 Dec 2024 16:36:01 +0800
Subject: [PATCH] modify resource deploy path.

---
 .gitea/workflows/deploy.yaml |  3 +--
 .gitignore                   |  3 ++-
 Server/conf/nginx.conf       | 36 +++++-------------------------------
 Server/conf/server.conf      |  5 -----
 4 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index f1a1b8a..5d00548 100755
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -44,9 +44,8 @@ jobs:
           username: ${{ vars.YUYUN_USER }}
           password: ${{ secrets.SERVER_ROOT_PASSWORD }}
           overwrite: true
-          strip_components: 1
           source: "resources/*.css,resources/*.xml"
-          target: /root/Server/resources
+          target: /root/Server/amass_blog
       - name: Copy lvgl to server
         uses: appleboy/scp-action@v0.1.7
         with:
diff --git a/.gitignore b/.gitignore
index a407a4f..da214b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,5 @@ CMakeLists.txt.user*
 build
 logs
 Server/logs
-Server/conf/cert
\ No newline at end of file
+Server/conf/cert
+resources/themes/bulma
\ No newline at end of file
diff --git a/Server/conf/nginx.conf b/Server/conf/nginx.conf
index 5bbf29a..2757416 100644
--- a/Server/conf/nginx.conf
+++ b/Server/conf/nginx.conf
@@ -64,10 +64,6 @@ http {
         server 127.0.0.1:7700;
     }
 
-    upstream typesense {
-        server 127.0.0.1:8108;
-    }
-    
     server {
         listen 443 ssl;
         server_name unraid.amass.fun;
@@ -207,13 +203,13 @@ http {
 
     server {
         listen 443 ssl;
-        server_name money-mobile.amass.fun;
+        server_name emoney.amass.fun;
 
         client_header_timeout 120s;         
         client_body_timeout 120s;           
 
-        ssl_certificate cert/money-mobile.amass.fun.pem;
-        ssl_certificate_key cert/money-mobile.amass.fun.key;
+        ssl_certificate cert/emoney.amass.fun.pem;
+        ssl_certificate_key cert/emoney.amass.fun.key;
         ssl_session_timeout 5m; #缓存有效期
         ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; #加密算法
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2; #安全链接可选的加密协议
@@ -385,28 +381,6 @@ http {
         }
     }
 
-    server {
-        listen 443 ssl;
-        server_name typesense.amass.fun;
-
-        client_header_timeout 120s;         
-        client_body_timeout 120s;           
-        client_max_body_size 512m;   
-
-        ssl_certificate cert/typesense.amass.fun.pem;
-        ssl_certificate_key cert/typesense.amass.fun.key;
-        ssl_session_timeout 5m; #缓存有效期
-        ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; #加密算法
-        ssl_protocols TLSv1 TLSv1.1 TLSv1.2; #安全链接可选的加密协议
-        ssl_prefer_server_ciphers on; #使用服务器端的首选算法
-        
-        location / {
-            proxy_set_header X-Forwarded-For $remote_addr;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_pass http://typesense;
-        }
-    }
-
     server {
         listen 443 ssl;
         server_name amass.fun;
@@ -427,7 +401,7 @@ http {
         listen 80;
         server_name amass.fun;
         location /resources {
-            root .;
+            root amass_blog;
         }
         location /speedtest {
             proxy_set_header X-Real-IP $remote_addr;
@@ -454,7 +428,7 @@ http {
         listen 80;
         server_name mirror.amass.fun;
         location /resources {
-            root .;
+            root amass_blog;
         }
         location /speedtest {
             proxy_set_header X-Real-IP $remote_addr;
diff --git a/Server/conf/server.conf b/Server/conf/server.conf
index 5bad38c..6dfec25 100644
--- a/Server/conf/server.conf
+++ b/Server/conf/server.conf
@@ -128,11 +128,6 @@ location /backend {
     proxy_pass http://speed_test;
 }
 
-location /resources {
-    root .;
-    index index.html index.htm;
-}
-
 location /Younger/ChatRoom {
 
     proxy_pass http://local;