up README.md

README.md

@@ -347,6 +347,45 @@ proxy:
       ```
      
    - S6的镜像
+     - 如果使用***系统生成的KEY***或者***自定义KEY_PUB,KEY_PRIV***，不需要修改启动脚本，但要在生成KEY后获取到KEY再`docker-compose up -d`
+         ```yaml
+         networks:
+           rustdesk-net:
+             external: false
+         services:
+           rustdesk-server:
+             container_name: rustdesk-server
+             ports:
+               - 21115:21115
+               - 21116:21116
+               - 21116:21116/udp
+               - 21117:21117
+               - 21118:21118
+               - 21119:21119
+             image: rustdesk/rustdesk-server-s6:latest
+             environment:
+               - RELAY=192.168.1.66:21117
+               - ENCRYPTED_ONLY=1
+             volumes:
+               - ./data:/data
+             restart: unless-stopped
+           rustdesk-api:
+             container_name: rustdesk-api
+             ports:
+               - 21114:21114
+             image: lejianwen/rustdesk-api
+             environment:
+               - TZ=Asia/Shanghai
+               - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
+               - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
+               - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
+               - RUSTDESK_API_RUSTDESK_KEY=<key> #系统生成的KEY
+             volumes:
+               - /data/rustdesk/api:/app/data #将数据库挂载
+             networks:
+               - rustdesk-net
+             restart: unless-stopped
+         ```
      - 如果使用***自定义KEY***，会需要修改启动脚本，覆盖镜像中的`/etc/s6-overlay/s6-rc.d/hbbr/run`和`/etc/s6-overlay/s6-rc.d/hbbr/run`
        1. 创建`hbbr/run`，自定义KEY才需要
           ```bash
@@ -407,45 +446,27 @@ proxy:
              - rustdesk-net
            restart: unless-stopped
        ```
-   - 如果使用***系统生成的KEY***或者***自定义KEY_PUB,KEY_PRIV***，不需要修改启动脚本，但要在生成KEY后获取到KEY再`docker-compose up -d`
+
-       ```yaml
+#### nginx反代
-       networks:
+
-         rustdesk-net:
+在`nginx`中配置反代
-           external: false
+
-       services:
-         rustdesk-server:
-           container_name: rustdesk-server
-           ports:
-             - 21115:21115
-             - 21116:21116
-             - 21116:21116/udp
-             - 21117:21117
-             - 21118:21118
-             - 21119:21119
-           image: rustdesk/rustdesk-server-s6:latest
-           environment:
-             - RELAY=192.168.1.66:21117
-             - ENCRYPTED_ONLY=1
-           volumes:
-             - ./data:/data
-           restart: unless-stopped
-         rustdesk-api:
-           container_name: rustdesk-api
-           ports:
-             - 21114:21114
-           image: lejianwen/rustdesk-api
-           environment:
-             - TZ=Asia/Shanghai
-             - RUSTDESK_API_RUSTDESK_ID_SERVER=192.168.1.66:21116
-             - RUSTDESK_API_RUSTDESK_RELAY_SERVER=192.168.1.66:21117
-             - RUSTDESK_API_RUSTDESK_API_SERVER=http://192.168.1.66:21114
-             - RUSTDESK_API_RUSTDESK_KEY=<key> #系统生成的KEY
-           volumes:
-             - /data/rustdesk/api:/app/data #将数据库挂载
-           networks:
-             - rustdesk-net
-           restart: unless-stopped
 ```
+server {
+    listen <your port>;
+    server_name <your server>;
+    location / {
+        proxy_pass http://<api-server[:port]>;
+        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;
+    }
+}
+```
+##### HTTPS等更多相关配置参考[wiki](https://github.com/lejianwen/rustdesk-api/wiki/Web-Client-V2-Preview-Document)
+
+
 #### 下载release直接运行
 
 [下载地址](https://github.com/lejianwen/rustdesk-api/releases)
@@ -488,21 +509,7 @@ proxy:
 
 6. 打开浏览器访问`http://<your server[:port]>/_admin/`，默认用户名密码为`admin`，请及时更改密码。
 
-#### nginx反代
+
-在`nginx`中配置反代
-```
-server {
-    listen <your port>;
-    server_name <your server>;
-    location / {
-        proxy_pass http://<api-server[:port]>;
-        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;
-    }
-}
-```
 ## 其他
 
 - [修改客户端ID](https://github.com/abdullah-erturk/RustDesk-ID-Changer)