diff --git a/config/open-im-ng-example.conf b/config/open-im-ng-example.conf index a817f7357..e5e584ff8 100644 --- a/config/open-im-ng-example.conf +++ b/config/open-im-ng-example.conf @@ -4,38 +4,28 @@ upstream im_msg_gateway{ upstream im_api{ server 127.0.0.1:10002; #IM群组用户api服务器地址 根据部署情况可指定多台 } -upstream im_jssdk_gateway{ - server 127.0.0.1:10003; #IM jssdk服务器地址 根据部署情况可指定多台 - } upstream storage { server 127.0.0.1:10005; #MinIO服务器地址 暂时支持1台 } -upstream im_admin{ - server 127.0.0.1:10006; #IM admin服务器地址 根据部署情况可指定多台 - } upstream im_grafana{ server 127.0.0.1:10007; #IM 统计服务器地址 docker-compose启动所在机器 } -upstream im_chat{ +upstream im_chat_api{ server 127.0.0.1:10008; #IM 商业版登录注册服务器地址 根据部署情况可指定多台 } -upstream im_complete_admin{ +upstream im_admin_api{ server 127.0.0.1:10009; #IM 商业版admin地址 根据部署情况可指定多台 } -upstream im_organization{ - server 127.0.0.1:10010; #IM 商业版组织架构服务器地址 根据部署情况可指定多台 - } upstream im_open_rtc{ server 127.0.0.1:7880; #rtc 音视频通话 服务器地址 根据部署情况可指定多台 } - server { listen 443; - server_name web.rentsoft.cn; #1 web im 端 域名 + server_name test-web.rentsoft.cn; #1 web im 端 域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/web.rentsoft.cn.crt; #2 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/web.rentsoft.cn.key; #3 证书 + ssl_certificate /etc/nginx/conf.d/ssl/test-web.rentsoft.cn.crt; #2 证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/test-web.rentsoft.cn.key; #3 证书 ssl_session_timeout 5m; gzip on; gzip_min_length 1k; @@ -72,22 +62,6 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_api/; } - location /jssdk_gateway { #10003 jssdk - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header X-real-ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://im_jssdk_gateway/; - } - location ^~/admin/ { #10006 admin - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header X-real-ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://im_admin/; - } location ^~/grafana/ { #10007 prometheus proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -96,29 +70,21 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_pass http://im_grafana/; } - location ^~/chat/ { #10008 chat login - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header X-real-ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://im_chat/; - } + location ^~/chat/ { #10008 im_chat_api + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header X-real-ip $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://im_chat_api/; + } location ^~/complete_admin/ { #10009 admin proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header X-real-ip $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://im_complete_admin/; - } - location ^~/organization/ { #10010 organization - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header X-real-ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://im_organization/; + proxy_pass http://im_admin_api/; } location ^~/open_rtc/ { #7880 rtc proxy_http_version 1.1; @@ -132,17 +98,17 @@ server { server { listen 80; - server_name web.rentsoft.cn ; #1 web im 端 域名 + server_name test-web.rentsoft.cn ; #1 web im 端 域名 rewrite ^(.*)$ https://${server_name}$1 permanent; } server { ssl_session_timeout 5m; listen 443; - server_name storage.rentsoft.cn; #1 MinIO存储域名 + server_name test-storage.rentsoft.cn; #1 MinIO存储域名 ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/storage.rentsoft.cn.crt; #证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/storage.rentsoft.cn.key; #证书 + ssl_certificate /etc/nginx/conf.d/ssl/test-storage.rentsoft.cn.crt; #证书 + ssl_certificate_key /etc/nginx/conf.d/ssl/test-storage.rentsoft.cn.key; #证书 gzip on; gzip_min_length 1k; gzip_buffers 4 16k; @@ -160,35 +126,3 @@ server { client_max_body_size 8000M; } } - - -server { - listen 443; - server_name admin.rentsoft.cn; #后台管理域名 - ssl on; - ssl_certificate /etc/nginx/conf.d/ssl/admin.rentsoft.cn.crt; # 证书 - ssl_certificate_key /etc/nginx/conf.d/ssl/admin.rentsoft.cn.key; #证书 - ssl_session_timeout 5m; - gzip on; - gzip_min_length 1k; - gzip_buffers 4 16k; - gzip_comp_level 2; - gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; - gzip_vary off; - gzip_disable "MSIE [1-6]\."; - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-Ip $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-NginX-Proxy true; - root /data1/online/Open-IM-Admin/dist/; #管理后台web静态资源存放路径 - index index.html; - try_files $uri $uri/ /index.html; - } -} - -server { - listen 80; - server_name admin.rentsoft.cn; #管理后台 域名 - rewrite ^(.*)$ https://${server_name}$1 permanent; -}