update res

.gitignore

+*.sw*

nginx.conf

@@ -78,6 +78,8 @@ http {
         '"uri":"$uri",'
         '"status":"$status"}';
 
-    include /etc/nginx/upstreams/*.conf;
-    include /etc/nginx/sites-available/*.conf;
+    #include /etc/nginx/upstreams/*.conf;
+    #include /etc/nginx/sites-available/*.conf;
+    include /etc/nginx/upstreams/php.conf;
+    include /etc/nginx/sites-available/uc.fxqifu.com.conf;
 }

res/php-fpm-normal.conf

+location / {
+	try_files $uri $uri/ /index.php$is_args$args;
+}

sites/gitlab-sync.fxqifu.com.cn.conf

-server {
-	listen 80;
-	server_name gitlab-sync.fxqifu.com.cn;
-	root /var/www/dev-ops/gitlab-sync;
-	index index.html index.php;
-
-	location / {
-                try_files $uri $uri/ /index.php$is_args$args;
-        }
-
-        location ~ \.php$ {
-                #fastcgi_pass gitlab-sync:9000;
-                #fastcgi_index index.php;
-                #fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-                #include fastcgi_params;
-        }
-
-	access_log /var/log/nginx/git.fxqifu.com_access.log access_body;
-	error_log /var/log/nginx/git.fxqifu.com_error.log error;
-}

sites/transaction.fxqifu.com.conf

-server {
-	listen 80;
-	server_name transaction.fxqifu.com;
-	return 301 https://$server_name$request_uri;
-}
-
-server {
-	listen 443 ssl;
-	server_name transaction.fxqifu.com transaction.fxqifu.com.cn;
-	index index.html index.php;
-	root /var/www/back-end/transaction/public;
-
-	include /etc/nginx/res/fxqifu.com_cert.conf;
-
-	include /etc/nginx/res/php-fpm.conf;
-
-	include /etc/nginx/res/static_resource.conf;
-
-	access_log /var/log/nginx/transaction.fxqifu.com_access.log access;
-	error_log /var/log/nginx/transaction.fxqifu.com_error.log error;
-}

sites/welfare.fxqifu.com.conf → sites/uc.fxqifu.com.conf

 server {
 	listen 80;
-	server_name welfare.fxqifu.com;
+	server_name uc.fxqifu.com;
 	return 301 https://$server_name$request_uri;
 }
 
 server {
 	listen 443 ssl;
-	server_name welfare.fxqifu.com welfare.fxqifu.com.cn;
+	server_name uc.fxqifu.com;
 	index index.html index.php;
-	root /var/www/back-end/welfare/public;
+	root /var/www/back-end/user-center/public;
 
 	include /etc/nginx/res/fxqifu.com_cert.conf;
 
-	include /etc/nginx/res/php-fpm.conf;
+	include /etc/nginx/res/php-fpm-normal.conf;
+
+    location ~ \.php$ {
+        fastcgi_pass user-center;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
 
 	include /etc/nginx/res/static_resource.conf;
 
-	access_log /var/log/nginx/welfare.fxqifu.com_access.log access;
-	error_log /var/log/nginx/welfare.fxqifu.com_error.log error;
+	access_log /var/log/nginx/uc.fxqifu.com_access.log access;
+	error_log /var/log/nginx/uc.fxqifu.com_error.log error;
 }

sites/xj-api.fxqifu.com.conf

-server {
-	listen 80;
-	server_name xj-api.fxqifu.com;
-	return 301 https://$server_name$request_uri;
-}
-
-server {
-	listen 443 ssl;
-	server_name xj-api.fxqifu.com xj-api.fxqifu.com.cn;
-	index index.html index.htm index.php;
-
-	include /etc/nginx/res/fxqifu.com_cert.conf;
-
-	location / { 
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header Host  $http_host;
-		proxy_set_header X-Nginx-Proxy true;
-		proxy_http_version 1.1;
-		proxy_set_header Connection "";
-		proxy_pass http://node-upstream;
-	}
-
-	include /etc/nginx/res/static_resource.conf;
-
-	#access_log /var/log/nginx/xj-api.fxqifu.com.cn_access.log;
-	error_log /var/log/nginx/xj-api.fxqifu.com.cn_error.log error;
-}

sites/xj-app.fxqifu.com.conf

-server {
-	listen 80;
-	server_name xj-app.fxqifu.com;
-	return 301 https://$server_name$request_uri;
-}
-
-server {
-	listen 443 ssl;
-	server_name xj-app.fxqifu.com xj-app.fxqifu.com.cn;
-	index index.html index.htm;
-	root /var/www/front-end/xj-app-web;
-
-	include /etc/nginx/res/fxqifu.com_cert.conf;
-
-	location / { 
-		try_files $uri $uri/ /index.html$is_args$args;
-	}
-
-	include /etc/nginx/res/static_resource.conf;
-
-	#access_log /var/log/nginx/xj-app.fxqifu.com_access.log;
-	error_log /var/log/nginx/xj-app.fxqifu.com_error.log error;
-}

sites/xj.fxqifu.com.conf

-server {
-	listen 80;
-	server_name xj.fxqifu.com;
-	return 301 https://$server_name$request_uri;
-}
-
-server {
-	listen 443 ssl;
-	server_name xj.fxqifu.com xj.fxqifu.com.cn;
-	index index.html index.htm;
-	root /var/www/front-end/xj-admin-web/dist;
-
-	include /etc/nginx/res/fxqifu.com_cert.conf;
-
-	location / { 
-		try_files $uri $uri/ /index.html$is_args$args;
-	}
-
-	include /etc/nginx/res/static_resource.conf;
-
-	#access_log /var/log/nginx/xj.fxqifu.com_access.log;
-	error_log /var/log/nginx/xj.fxqifu.com_error.log error;
-}

sites_online/uc.fxqifu.com.conf

@@ -6,13 +6,20 @@ server {
 
 server {
 	listen 443 ssl;
-	server_name uc.fxqifu.com uc.fxqifu.com.cn;
+	server_name uc.fxqifu.com;
 	index index.html index.php;
 	root /var/www/back-end/user-center/public;
 
 	include /etc/nginx/res/fxqifu.com_cert.conf;
 
-	include /etc/nginx/res/php-fpm.conf;
+	include /etc/nginx/res/php-fpm-normal.conf;
+
+    location ~ \.php$ {
+        fastcgi_pass user-center;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
 
 	include /etc/nginx/res/static_resource.conf;
 

upstreams/php.conf

-upstream php-upstream { server php-fpm:9000; }
+#upstream php-upstream { server php-fpm:9000; }
+upstream user-center { server user-center:9000; }