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

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';

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

@@ -1,19 +1,17 @@
 server {
     listen       80;
-    #listen       [::]:80;
+    listen       [::]:80;
     server_name  img.yimian.xyz;
     rewrite ^(.*)$  https://$host$1 permanent;
 }
 
 
 server {
-    # listen       80;
-    # listen       [::]:80;
+    #listen       80;
+    #listen       [::]:80;
     listen       443 ssl;
 
     server_name  img.yimian.xyz;
-    root         /home/www/img/;
-    index index.php index.html;
 
     ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; #2
     ssl_certificate_key /mnt/config/ssl/yimian.xyz/yimian.xyz.key; #3
@@ -23,16 +21,21 @@ server {
     ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
     ssl_prefer_server_ciphers on;
-    # error_page 404 = /404.php;
 
-    if (-f $request_filename/index.html){     rewrite (.*) $1/index.html break; } 
-    if (-f $request_filename/index.php){     rewrite (.*) $1/index.php; } 
-    if (!-f $request_filename){     rewrite (.*) /index.php; }
-    if (!-e $request_filename) {    rewrite ^(.*)$ /index.php$1 last; }
 
     # Load configuration files for the default server block.
-    include /mnt/etc/common/nginx/default.d/*.conf;
-
-
 
+    location = / {
+        root /home/www/img;
+        index index.html;
+    }
+
+    location / {
+        proxy_pass http://ushio-img:80;
+        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;
+    }
 }