Merge branch 'master' of github.com:IoTcat/ushio-etc

common/frp/frpc.ini.home

@@ -13,12 +13,18 @@ type = http
 local_port = 80
 custom_domains = home.yimian.xyz
 
+[web_home_tcp]
+type = tcp
+local_ip = 127.0.0.1
+local_port = 8123
+remote_port = 8123
+
 [docker_yimian]
 type = https
 local_port = 5000
 custom_domains = docker.yimian.xyz
 
-[docker_yimian2]
+[docker_yimian_tcp]
 type = tcp
 local_ip = 127.0.0.1
 local_port = 5000
@@ -35,6 +41,12 @@ type = https
 local_port = 443
 custom_domains = git.yimian.xyz
 
+[ushio_git_tcp]
+type = tcp
+local_ip = 127.0.0.1
+local_port = 3000
+remote_port = 3000
+
 [ushio_git_ssh]
 type = tcp
 local_port = 222

usa.yimian.xyz/nginx/conf.d/docker.yimian.xyz.conf

@@ -24,19 +24,20 @@ server {
          #proxy_set_header Connection 'upgrade';
          #proxy_set_header Host $host;
          #proxy_cache_bypass $http_upgrade;
-         resolver 8.8.8.8;
-         proxy_ssl_server_name on;
-         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;
-         proxy_set_header Host $host:$server_port;
-         proxy_pass https://$host:4443; #通过域名访问frp服务
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        #proxy_set_header Host $host;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
+         #resolver 8.8.8.8;
+         #proxy_ssl_server_name on;
+         #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;
+         #proxy_set_header Host $host:$server_port;
+         #proxy_pass http://frps:4450; #通过域名访问frp服务
+        #proxy_read_timeout 300s;
+        #proxy_send_timeout 300s;
+        ##proxy_set_header Host $host;
+        #proxy_http_version 1.1;
+        #proxy_set_header Upgrade $http_upgrade;
+        #proxy_set_header Connection $connection_upgrade;
  
+         proxy_pass http://frps:4450;
     } 
 }

usa.yimian.xyz/nginx/conf.d/git.yimian.xyz.conf

@@ -24,19 +24,25 @@ server {
          #proxy_set_header Connection 'upgrade';
          #proxy_set_header Host $host;
          #proxy_cache_bypass $http_upgrade;
-         resolver 8.8.8.8;
-         proxy_ssl_server_name on;
-         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;
-         proxy_set_header Host $host:$server_port;
-         proxy_pass https://$host:4443; #通过域名访问frp服务
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
+         #resolver 8.8.8.8;
+         #proxy_ssl_server_name on;
+         #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;
+         #proxy_set_header Host $host:$server_port;
+         #proxy_pass http://frps:3000; #通过域名访问frp服务
+        #proxy_read_timeout 300s;
+        #proxy_send_timeout 300s;
         #proxy_set_header Host $host;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
+        #proxy_http_version 1.1;
+        #proxy_set_header Upgrade $http_upgrade;
+        #proxy_set_header Connection $connection_upgrade;
+         proxy_pass http://frps:3000;
+         proxy_http_version 1.1;
+         proxy_set_header Upgrade $http_upgrade;
+         proxy_set_header Connection 'upgrade';
+         proxy_set_header Host $host;
+         proxy_cache_bypass $http_upgrade;
  
     } 
 }

usa.yimian.xyz/nginx/conf.d/home.yimian.xyz.conf

@@ -15,7 +15,7 @@ server {
     ssl_certificate_key     /mnt/config/ssl/yimian.xyz/yimian.xyz.key;
 
     location / {
-         proxy_pass http://frps:4480;
+         proxy_pass http://frps:8123;
          proxy_http_version 1.1;
          proxy_set_header Upgrade $http_upgrade;
          proxy_set_header Connection 'upgrade';