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

cn.yimian.xyz/nginx/conf.d/cp-acc.yimian.xyz.conf

@@ -0,0 +1,40 @@
+server {
+    listen       80;
+    #listen       [::]:80;
+    server_name  cp-acc.yimian.xyz;
+    rewrite ^(.*)$  https://$host$1 permanent;
+}
+
+
+server {
+    # listen       80;
+    # listen       [::]:80;
+    listen       443 ssl;
+
+    server_name  cp-acc.yimian.xyz;
+    root         /home/www/cp-acc;
+    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
+
+    ssl_session_cache shared:SSL:1m;
+    ssl_session_timeout 5m;
+    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;
+
+
+    # Load configuration files for the default server block.
+    include /mnt/etc/common/nginx/default.d/*.conf;
+
+
+    error_page 404 /404.html;
+        location = /40x.html {
+    }
+
+    error_page 500 502 503 504 /50x.html;
+        location = /50x.html {
+    }
+}

cn.yimian.xyz/nginx/conf.d/guide.yimian.xyz.conf

@@ -0,0 +1,34 @@
+server {
+    listen       80;
+    #listen       [::]:80;
+    server_name  guide.yimian.xyz;
+    rewrite ^(.*)$  https://$host$1 permanent;
+}
+
+
+server {
+    # listen       80;
+    # listen       [::]:80;
+    listen       443 ssl;
+
+    server_name  guide.yimian.xyz;
+    root         /home/www/guide;
+    index index.php index.html;
+    client_max_body_size     50m;
+
+    ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; #2
+    ssl_certificate_key /mnt/config/ssl/yimian.xyz/yimian.xyz.key; #3
+
+    ssl_session_cache shared:SSL:1m;
+    ssl_session_timeout 5m;
+    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;
+
+    # Load configuration files for the default server block.
+    include /mnt/etc/common/nginx/default.d/*.conf;
+
+    location / {
+    }
+}

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

@@ -12,7 +12,7 @@ server {
     listen       443 ssl;
 
     server_name  img.yimian.xyz;
-    root         /home/www/img;
+    root         /home/www/img/;
     index index.php index.html;
 
     ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; #2
@@ -25,17 +25,10 @@ server {
     ssl_prefer_server_ciphers on;
     # error_page 404 = /404.php;
 
-    location / {
-        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 (-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;