备份nginx的修改

梁志锋
Commit 1488a32a49a79e8cb053a60bb96a163f0a8fec24 1 parent b71b3c4a
Showing 8 changed files with 156 additions and 115 deletions
script/nginx/conf/vhosts/location/yohobuywap_app.conf
script/nginx/conf/vhosts/location/yohobuywap_httpskey.conf
script/nginx/conf/vhosts/location/yohobuywap_idc.conf
script/nginx/conf/vhosts/location/yohobuywap_node.conf
script/nginx/conf/vhosts/location/yohobuywap_php.conf
script/nginx/conf/vhosts/location/yohobuywap_static.conf
script/nginx/conf/vhosts/yohobuywap.conf
script/nginx/conf/vhosts/yohobuywap_nohttps.conf → script/nginx/conf/vhosts/yohobuywap.httpsbak.conf
--- a/script/nginx/conf/vhosts/location/yohobuywap_app.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/location/yohobuywap_app.conf
View file @1488a32
- # app api
+    #app api
     location =/appembed {
         default_type application/json;
         return 200 '{"code":200,"message":"app embed","data":{"open":"N","url":"http://m.yohobuy.com"}}';
--- a/script/nginx/conf/vhosts/location/yohobuywap_httpskey.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/location/yohobuywap_httpskey.conf
View file @1488a32
--- a/script/nginx/conf/vhosts/location/yohobuywap_idc.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/location/yohobuywap_idc.conf
View file @1488a32
- # idc old proxy
+    #idc old proxy
     location =/invite.html {
         access_log /Data/logs/access.m.yohobuy.com.log  fenxi;
         proxy_redirect off;
@@ -194,7 +194,7 @@
     }
      location =/product/new/index {
-            return 301 https://m.yohobuy.com/product/new;
+            return 301 http://m.yohobuy.com/product/new;
         }
@@ -208,17 +208,22 @@
         }
       location =/help.html {
-             return 301 https://m.yohobuy.com/home/help;
+             return 301 http://m.yohobuy.com/home/help;
         }
        location ^~ /trends_detail_ {
-             return 301 https://guang.m.yohobuy.com;
+             return 301 http://guang.m.yohobuy.com;
       }
-      location =/about {
-             return 301 https://$host$request_uri;
-        }
+      #location =/about {
+      #       return 301 http://$host$request_uri;
+      #  }
+
+      #location =/brand/index/about{
+      #       return 301 http://$host$request_uri;
+      #  }
-      location =/brand/index/about{
-             return 301 https://$host$request_uri;
+      location ^~ /product/pro_ {
+        return 301 http://item.m.yohobuy.com$request_uri;
     }
+
--- a/script/nginx/conf/vhosts/location/yohobuywap_node.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/location/yohobuywap_node.conf
View file @1488a32
-   location ^~ /passport/login/wechat/ {
+
+location ^~ /passport/login/wechat/ {
     proxy_redirect off;
     proxy_pass http://yohobuywap-node;
     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   Accept-Encoding "gzip";
-    }
+}
-    location ^~ /activity {
+location ^~ /activity {
     proxy_redirect off;
     proxy_pass http://yohobuywap-node;
     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   Accept-Encoding "gzip";
-    }
+}
-   location = /coupon/index {
-        return 301 /activity/coupon?$query_string;
-    }
-    location ^~ /product/sale/ {
+location ^~ /product/sale/ {
     proxy_redirect off;
     proxy_pass http://yohobuywap-node;
     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   Accept-Encoding "gzip";
-    }
+}
-    location ^~ /guang/star/ {
+location ^~ /guang/star/ {
     proxy_redirect off;
     proxy_pass http://yohobuywap-node;
     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   Accept-Encoding "gzip";
-    }
+}
-    location ^~ /product/outlet/ {
+location ^~ /product/outlet/ {
     proxy_redirect off;
     proxy_pass http://yohobuywap-node;
     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   Accept-Encoding "gzip";
-    }
+}
--- a/script/nginx/conf/vhosts/location/yohobuywap_php.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/location/yohobuywap_php.conf
View file @1488a32
-
-   #app show help page
-       location =/help/shareorder.html {
-           root  /Data/PE/yohobuy_H5/assets;
-           expires 7d;
+    # wechat pay
+    location ^~ /shopping/pay/aliwapreturn {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   m.yohobuy.com;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
     }
-
-    # product detail page 301 redirect to item use https
-    location ^~ /product/pro_ {
-        return 301 https://item.m.yohobuy.com$request_uri;
+   location ^~ /home/orders/pay {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        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   Accept-Encoding "gzip";
     }
-    location ^~ /shopping/pay/aliwapreturn {
+   location ^~ /shopping/pay/wechatwapapi {
         proxy_redirect off;
         proxy_pass http://yohobuy;
-        proxy_set_header   Host   m.yohobuy.com;
+        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   Accept-Encoding "gzip";
     }
-     location / {
+    location ^~ /coupon {
         proxy_redirect off;
         proxy_pass http://yohobuy;
         proxy_set_header   Host   $host;
@@ -28,3 +34,5 @@
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header   Accept-Encoding "gzip";
     }
+
+
--- a/script/nginx/conf/vhosts/location/yohobuywap_static.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/location/yohobuywap_static.conf
View file @1488a32
-    # static file
+    #static file
     location =/favicon.ico {
         expires    7d;
     }
@@ -23,7 +23,6 @@
         expires 7d;
     }
-    ##百度站长的校验文件, 百度站长账号feng322169 密码yoho9646
     location = /baidu_verify_bXX90VTyvs.html {
         root  /Data/PE/yohobuy_H5/assets;
         expires 7d;
--- a/script/nginx/conf/vhosts/yohobuywap.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/yohobuywap.conf
View file @1488a32
@@ -6,38 +6,25 @@ server
     access_log /Data/logs/nginx/access_wap.yohobuy.com.log  fenxi;
     error_log  /Data/logs/error_wap.yohobuy.com.log warn;
+     # old idc
+     include vhosts/location/yohobuywap_idc.conf;
      # app
      include vhosts/location/yohobuywap_app.conf;
+     # php
+     include vhosts/location/yohobuywap_php.conf;
+     # node
+     include vhosts/location/yohobuywap_node.conf;
+     # static file
+     include vhosts/location/yohobuywap_static.conf;
-    #for wechat pay
-    location ^~ /home/orders/pay {
-        proxy_redirect off;
-        proxy_pass http://yohobuy;
-        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   Accept-Encoding "gzip";
-    }
+     #https flag, 1 means HTTPS, 0 means HTTP
+     set $httpsFlag 0;
-   location ^~ /shopping/pay/wechatwapapi {
-        proxy_redirect off;
-        proxy_pass http://yohobuy;
-        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   Accept-Encoding "gzip";
+     location / {
+              if ($httpsFlag = 1) {
+                  return 301 https://$host$request_uri;
               }
-    #  location =/shopping/pay/aliwapreturn {
-    #       proxy_redirect off;
-    #       proxy_pass http://yohobuy_idc;
-     #      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   Accept-Encoding "gzip";
-     #  }
-
-    location ^~ /coupon {
              proxy_redirect off;
              proxy_pass http://yohobuy;
              proxy_set_header   Host   $host;
@@ -45,14 +32,8 @@ server
              proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
              proxy_set_header   Accept-Encoding "gzip";
      }
-
-    # others http 301 redirect https
-    location / {
-        return 301 https://m.yohobuy.com$request_uri;
-    }
 }
-
 server
 {
      listen       443;
@@ -61,6 +42,9 @@ server
      ssl_certificate      /Data/local/nginx-1.8.0/conf/ssl/yohobuy.pem;
      ssl_certificate_key  /Data/local/nginx-1.8.0/conf/ssl/yohobuy.key;
+     # https key
+     include vhosts/location/yohobuywap_httpskey.conf;
+
      root  /Data/PE/yohobuy_H5/yohobuy/m.yohobuy.com/public;
      access_log /Data/logs/nginx/access_wap.yohobuy.com.log  fenxi;
@@ -77,18 +61,52 @@ server
       # static file
       include vhosts/location/yohobuywap_static.conf;
-     #for we chat pay
-     location =/home/orders/pay{
+      #https flag, 1 means HTTPS, 0 means HTTP
+      set $httpsFlag 0;
+
+     location / {
+         if ($httpsFlag = 0) {
              return 301 http://$host$request_uri;
          }
-     location =/shopping/pay/wechatwapapi {
-         return 301 http://$host$request_uri;
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        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   Accept-Encoding "gzip";
     }
+}
-     #location =/shopping/pay/aliwapreturn {
-     #    return 301 http://$host$request_uri;
-     #}
+server
+{
+
+    listen       80;
+    server_name  guang.m.yohobuy.com;
+
+    access_log /Data/logs/nginx/access_wap.yohobuy.com.log  fenxi;
+    error_log  /Data/logs/error_wap.yohobuy.com.log warn;
+     # static file
+     include vhosts/location/yohobuywap_static.conf;
+
+     # guang rss
+     location ^~  /rss {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        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   Accept-Encoding "gzip";
+     }
+
+     location / {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        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   Accept-Encoding "gzip";
+     }
 }
 server
@@ -99,10 +117,23 @@ server
     access_log /Data/logs/nginx/access_wap.yohobuy.com.log  fenxi;
     error_log  /Data/logs/error_wap.yohobuy.com.log warn;
-    # others http 301 redirect https
+    # static file
+    include vhosts/location/yohobuywap_static.conf;
+
+      #https flag, 1 means HTTPS, 0 means HTTP
+     set $httpsFlag 0;
+
      location / {
+         if ($httpsFlag = 1) {
              return 301 https://$host$request_uri;
          }
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        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   Accept-Encoding "gzip";
+    }
 }
 server
@@ -116,7 +147,6 @@ server
      # https key
      include vhosts/location/yohobuywap_httpskey.conf;
-
      access_log /Data/logs/nginx/access_wap.yohobuy.com.log  fenxi;
      error_log  /Data/logs/error_wap.yohobuy.com.log warn;
@@ -135,7 +165,6 @@ server
          proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
          proxy_set_header   Accept-Encoding "gzip";
       }
-
       # guang rss
       location ^~  /rss {
          proxy_redirect off;
@@ -146,7 +175,13 @@ server
          proxy_set_header   Accept-Encoding "gzip";
      }
+          #https flag, 1 means HTTPS, 0 means HTTP
+          set $httpsFlag 0;
+
           location / {
+              if ($httpsFlag = 0) {
+                  return 301 http://$host$request_uri;
+              }
              proxy_redirect off;
              proxy_pass http://yohobuy;
              proxy_set_header   Host   $host;
@@ -154,7 +189,7 @@ server
              proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
              proxy_set_header   Accept-Encoding "gzip";
          }
-}
+     }
 server
 {
@@ -174,7 +209,7 @@ server
      }
 }
- server
+server
 {
      listen 443;
      server_name  analytics.m.yohobuy.com;
@@ -193,5 +228,26 @@ server
             proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header   Accept-Encoding "gzip";
       }
+}
+
+ server
+{
+     listen 80;
+     server_name  analytics.m.yohobuy.com;
+
+    # ssl_certificate      /Data/local/nginx-1.8.0/conf/ssl/m.yohobuy.pem;
+    # ssl_certificate_key  /Data/local/nginx-1.8.0/conf/ssl/m.yohobuy.key;
+
+     # https key
+    # include vhosts/location/yohobuywap_httpskey.conf;
+
+      location /  {
+            proxy_redirect off;
+            proxy_pass http://yohobuy_analytics;
+            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   Accept-Encoding "gzip";
+      }
 }
--- a/script/nginx/conf/vhosts/yohobuywap_nohttps.conf → script/nginx/conf/vhosts/yohobuywap.httpsbak.conf
View file @1488a32
+++ b/script/nginx/conf/vhosts/yohobuywap_nohttps.conf → script/nginx/conf/vhosts/yohobuywap.httpsbak.conf
View file @1488a32
@@ -67,7 +67,7 @@ server
      error_log  /Data/logs/error_wap.yohobuy.com.log warn;
      # old idc
-     include vhosts/location/yohobuywap_idc_nohttps.conf;
+     include vhosts/location/yohobuywap_idc.conf;
      # app
      include vhosts/location/yohobuywap_app.conf;
      # php
@@ -77,42 +77,17 @@ server
      # static file
      include vhosts/location/yohobuywap_static.conf;
-      #for wechat pay
-       location ^~ /home/orders/pay {
-           proxy_redirect off;
-           proxy_pass http://yohobuy;
-           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   Accept-Encoding "gzip";
+     #for we chat pay
+     location =/home/orders/pay{
+         return 301 http://$host$request_uri;
      }
-
-      location ^~ /shopping/pay/wechatwapapi {
-           proxy_redirect off;
-           proxy_pass http://yohobuy;
-           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   Accept-Encoding "gzip";
+     location =/shopping/pay/wechatwapapi {
+         return 301 http://$host$request_uri;
      }
-       #  location =/shopping/pay/aliwapreturn {
-       #       proxy_redirect off;
-       #       proxy_pass http://yohobuy_idc;
-        #      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   Accept-Encoding "gzip";
-        #  }
-
-       location ^~ /coupon {
-           proxy_redirect off;
-           proxy_pass http://yohobuy;
-           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   Accept-Encoding "gzip";
-       }
+     #location =/shopping/pay/aliwapreturn {
+     #    return 301 http://$host$request_uri;
+     #}
 }