Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

nginx.conf

@@ -12,8 +12,6 @@ http {
 	log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                      '$status $body_bytes_sent "$http_referer" '
                      '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"';
-
-	proxy_cache_path /opt/nginx_cache/ levels=1:2 keys_zone=my_zone:10m inactive=300s max_size=5g;
 	access_log  logs/access.log  main;
 	sendfile        on;
 	#tcp_nopush     on;
@@ -42,16 +40,10 @@ http {
 			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
 		}
 		location /profile/ {
-			proxy_cache my_zone;
-			proxy_cache_valid  200 304 12h;
-			proxy_cache_key $host$uri$is_args$args;
 			alias /opt/profile/;
 			index index.html index.htm;
 		}
 		location / {
-			proxy_cache my_zone;
-			proxy_cache_valid  200 304 12h;
-			proxy_cache_key $host$uri$is_args$args;
 			try_files $uri $uri/ /index.html;
 			root /opt/sfms3.0;
 			index index.html index.htm;