2 Commits 93787dfbe9 ... b975d07016

Autore SHA1 Messaggio Data
  glass b975d07016 Merge branch 'master' of git:glass/deploy 4 mesi fa
  glass 52f2a6b1d0 dev 4 mesi fa
4 ha cambiato i file con 156 aggiunte e 3 eliminazioni
  1. 6 2
      README.md
  2. 2 1
      nginx.md
  3. 58 0
      serve.conf
  4. 90 0
      serve.md

+ 6 - 2
README.md

@@ -8,7 +8,7 @@
 
 ```
 apt update
-apt install -y ca-certificates curl
+apt install -y ca-certificates curl unzip
 install -m 0755 -d /etc/apt/keyrings
 curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
 chmod a+r /etc/apt/keyrings/docker.asc
@@ -34,4 +34,8 @@ cd deploy/
 
 # 代理节点
 
-[配置代理节点](proxy.md)
+[配置代理节点](proxy.md)
+
+# 服务节点
+
+[配置服务节点](serve.md)

+ 2 - 1
nginx.md

@@ -3,7 +3,7 @@
 下载镜像
 
 ```
-wget https://im.whatup.cc/docker/nginx.tar
+wget https://im.whatup.cc/files/nginx.tar
 ```
 
 导入镜像
@@ -21,6 +21,7 @@ docker run -d \
     --restart=always \
     --network=local \
     -v /home/certbot/letsencrypt:/etc/letsencrypt \
+    -v /home/webpage:/var/lib/webpage \
     --name=nginx \
     nginx:certbot
 ```

+ 58 - 0
serve.conf

@@ -0,0 +1,58 @@
+server {
+    listen 80;
+    server_name SERVER_NAME;
+    
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name SERVER_NAME;
+
+    ssl_certificate      /etc/letsencrypt/live/SERVER_NAME/fullchain.pem;
+    ssl_certificate_key  /etc/letsencrypt/live/SERVER_NAME/privkey.pem;
+    ssl_session_timeout  5m;
+    ssl_protocols  TLSv1.2 TLSv1.3;
+    ssl_ciphers  HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers   on;
+
+    client_max_body_size 1024m;
+
+    location /group/signal {
+        proxy_pass http://im-serve:8080;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /files/ {
+        root /var/lib/webpage/;
+    }
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header x-forwarded-for $proxy_add_x_forwarded_for;
+
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' '$http_origin';
+            add_header 'Access-Control-Allow-Methods' '*';
+            add_header 'Access-Control-Allow-Headers' '*';
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Content-Type' 'text/plain; charset=utf-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+
+        if ($http_dandelion_service = true) {
+            proxy_pass http://im-serve:8192;
+            break;
+        }
+
+        proxy_pass http://im-serve:8080;
+    }
+}

+ 90 - 0
serve.md

@@ -0,0 +1,90 @@
+# 安装MySQL
+
+```
+docker run -d \
+    --privileged=true \
+    --restart=always \
+    --network=local \
+    -e MYSQL_ROOT_PASSWORD=root \
+    -e MYSQL_DATABASE=d_dandelion \
+    -v /home/mysql/lib:/var/lib/mysql \
+    --name=mysql \
+    mysql:lts
+```
+
+# 安装Redis
+
+```
+docker run -d \
+    --restart=always \
+    --privileged=true \
+    --network=local \
+    --name=redis \
+    redis:latest
+```
+
+# 安装Serve服务
+
+下载镜像
+
+```
+wget https://im.whatup.cc/files/serve.tar
+```
+
+导入镜像
+
+```
+docker load -i serve.tar
+```
+
+启动
+
+```
+docker run -d \
+    --privileged=true \
+    --network=local \
+    -v /home/tomcat/webapps:/tomcat/webapps \
+    -v /home/tomcat/upload:/tomcat/webapps/ROOT/upload \
+    -v /home/tomcat/logs:/tomcat/logs \
+    -v /home/service:/service \
+    --name=serve \
+    im:serve
+```
+
+# 安装Nginx
+
+[Nginx](nginx.md)
+
+# 配置Nginx
+
+```
+sed -i 's/SERVER_NAME/要配置的域名/g' serve.conf
+
+docker cp serve.conf nginx:/etc/nginx/http.d/
+
+docker exec -it nginx nginx -t
+docker exec -it nginx nginx -s reload
+```
+
+# 安装Coturn
+
+[Coturn](coturn.md)
+
+# 更新服务
+
+```
+wget https://im.whatup.cc/files/dandelion
+wget https://im.whatup.cc/files/dandelion-web.war
+
+docker stop -t 1 serve
+
+mkdir -p /home/service/bin
+rm -rf /home/service/bin/dandelion
+cp -rf dandelion /home/service/bin/
+
+rm -rf /home/tomcat/webapps/ROOT
+unzip -q dandelion-web.war -d /home/tomcat/webapps/ROOT
+sed -i 's/photon.redis.host.*/photon.redis.host=redis/g' /home/tomcat/webapps/ROOT/WEB-INF/classes/dandelion.config
+
+docker start serve
+```