glass 4 mesi fa
parent
commit
6b34acd3ea
3 ha cambiato i file con 42 aggiunte e 48 eliminazioni
  1. 33 1
      coturn.md
  2. 0 43
      proxy-ip.conf
  3. 9 4
      proxy.md

+ 33 - 1
coturn.md

@@ -1,5 +1,23 @@
 # 安装Coturn
 
+## 从官方下载Coturn
+
+```
+docker pull coturn/coturn
+```
+
+## 从Whatup下载
+
+> 建议优先从官方下载
+
+```
+wget https://im.whatup.cc/files/coturn.tar
+
+docker load -i coturn.tar
+```
+
+## 启动
+
 ```
 docker run -d \
     --privileged=true \
@@ -13,11 +31,25 @@ docker run -d \
 
 # 配置Coturn
 
+## 使用域名
+
 ```
 sed -i 's/SERVER_NAME/要配置的域名/g' turnserver.conf
-docker cp turnserver.conf coturn:/etc/coturn/
+```
+
+## 使用IP
+
+```
+sed -i 's/SERVER_NAME/要配置的IP/g' turnserver.conf
+sed -i 's/fullchain.pem/ip.crt/g' turnserver.conf
+sed -i 's/privkey.pem/ip.key/g' turnserver.conf
+```
+
+## 更新配置
 
+```
 docker exec -it coturn mkdir -p /var/log/coturn/
+docker cp turnserver.conf coturn:/etc/coturn/
 
 docker restart coturn
 ```

+ 0 - 43
proxy-ip.conf

@@ -1,43 +0,0 @@
-server {
-    listen 80;
-    server_name _;
-    
-    return 301 https://$host$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name _;
-
-    ssl_certificate      /etc/nginx/http.d/ip.crt;
-    ssl_certificate_key  /etc/nginx/http.d/ip.key;
-    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 https://im.whatup.cc;
-        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 / {
-        proxy_ssl_server_name on;
-        proxy_ssl_verify off;
-
-        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 https;
-        
-        proxy_pass https://im.whatup.cc;
-    }
-}

+ 9 - 4
proxy.md

@@ -8,20 +8,25 @@
 
 ```
 sed -i 's/SERVER_NAME/要配置的域名/g' proxy.conf
-docker cp proxy.conf nginx:/etc/nginx/http.d/
 ```
 
 ## 使用IP
 
 ```
-docker cp proxy-ip.conf nginx:/etc/nginx/http.d/
-docker cp ip.crt nginx:/etc/nginx/http.d/
-docker cp ip.key nginx:/etc/nginx/http.d/
+sed -i 's/SERVER_NAME/要配置的IP/g' proxy.conf
+sed -i 's/fullchain.pem/ip.crt/g' proxy.conf
+sed -i 's/privkey.pem/ip.key/g' proxy.conf
+
+mkdir -p /home/certbot/letsencrypt/live/要配置的IP/
+cp 证书.crt /home/certbot/letsencrypt/live/要配置的IP/ip.crt
+cp 证书.key /home/certbot/letsencrypt/live/要配置的IP/ip.key
 ```
 
 ## 更新Nginx配置
 
 ```
+docker cp proxy.conf nginx:/etc/nginx/http.d/
+
 docker exec -it nginx nginx -t
 docker exec -it nginx nginx -s reload
 ```