deason 2 жил өмнө
parent
commit
33c256acc5

+ 1 - 1
nginx/dev-192.168.10.39/nginx.conf

@@ -109,7 +109,7 @@ http {
 
 	# =====================================================================
 
-	include sites/http80.conf;
+#	include sites/http80.conf;
 	#include sites/https443.conf;
 	include sites/v3.conf;
 	include sites/http7200.conf;

+ 1 - 1
nginx/dev-192.168.10.39/sites/v3.conf

@@ -1,7 +1,7 @@
 server {
 	listen 443 ssl;
 	listen 80;
-        #server_name    *.dev39.qmth.com.cn  dev39.qmth.com.cn;
+        server_name    *.dev39.qmth.com.cn  dev39.qmth.com.cn;
 
 	charset utf-8;
 	error_page 404 /40x.html;

+ 1 - 1
nginx/test-192.168.10.41/nginx.conf

@@ -112,7 +112,7 @@ http {
 	# =====================================================================
 
 	# include sites/http80.conf;
-	include sites/https443.conf;
+        #include sites/https443.conf;
 	include sites/v3.conf;
 	include sites/http8200.conf;
 	include sites/block_ips.conf;

+ 1 - 2
nginx/test-192.168.10.41/sites/v3.conf

@@ -3,8 +3,7 @@ server {
 	listen 80;
 	charset utf-8;
 	error_page 404 /40x.html;
-	#server_name whdx.test41.qmth.com.cn   *.test41.qmth.com.cn  192.168.10.41 *.com *.cn localhost;
-	server_name whdx.test41.qmth.com.cn;
+	server_name *.test41.qmth.com.cn;
 
 	ssl_certificate ssl/whdx/cert.pem;
 	ssl_certificate_key ssl/whdx/key.pem;

+ 0 - 229
nginx/test-192.168.10.41/sites/v3.conf.bak

@@ -1,229 +0,0 @@
-server {
-        listen 443 ssl;
-        listen 80;
-        charset utf-8;
-        error_page 404 /40x.html;
-        server_name *.test41v3.qmth.com.cn;
-        ssl_certificate        /usr/local/nginx/conf/ssl/test41/7664566_hktest.test41v3.qmth.com.cn.pem;
-        ssl_certificate_key    /usr/local/nginx/conf/ssl/test41/7664566_hktest.test41v3.qmth.com.cn.key;
-
-        ssl_session_cache       shared:SSL:1m;
-        ssl_session_timeout     5m;
-        ssl_ciphers     HIGH:!aNULL:!MD5;
-        ssl_prefer_server_ciphers on;
-
-
-
-        location = / {
-                rewrite / /admin/ last;
-        }
-
-        location = /admin {
-                rewrite /admin /admin/ last;
-        }
-
-        location ^~ /admin/ {
-                alias /home/admin/project/examcloud/static-new/admin/dist/;
-                try_files $uri $uri/ /admin/index.html;
-        }
-
-        location ^~ /admin/js/ {
-                alias /home/admin/project/examcloud/static-new/admin/dist/js/;
-                try_files $uri $uri/ =404;
-        }
-
-        location = /oe-web {
-                rewrite /oe-web /oe-web/ last;
-        }
-
-        location ^~ /oe-web/ {
-                alias /home/admin/project/examcloud/static-new/oe-web-v3/dist/;
-                try_files $uri $uri/ /oe-web/index.html;
-        }
-
-        location ^~ /oe-web/assets/ {
-                alias /home/admin/project/examcloud/static-new/oe-web-v3/dist/assets/;
-                try_files $uri $uri/ =404;
-        }
-
-        location ^~ /models/ {
-                alias /home/admin/project/examcloud/static-new/oe-web-v3/dist/models/;
-                try_files $uri $uri/ =404;
-        }
-
-        # location ~* (js|css|img|fonts|models) {
-        #       root /home/admin/project/examcloud/static-new/oe-web/dist/;
-        # }
-
-        location = /oe-wap {
-                rewrite /oe-wap /oe-wap/ last;
-        }
-
-        location ^~ /oe-wap/ {
-                alias /home/admin/project/examcloud/static-new/oe-wap/dist/;
-                try_files $uri $uri/ /oe-wap/index.html;
-        }
-
-        location = /photo-upload {
-                rewrite /photo-upload /photo-upload/ last;
-        }
-
-        location ^~ /photo-upload/ {
-                alias /home/admin/project/examcloud/static-new/photo-upload/dist/;
-                try_files $uri $uri/ /photo-upload/index.html;
-        }
-
-        location ^~ /electron-config/ {
-                alias /home/admin/project/examcloud/static-new/electron-config/;
-        }
-
-        location ^~ /downloads/ {
-                alias /home/admin/project/examcloud/static-new/downloads/;
-        }
-
-        location ^~ /oe/facepp_api {
-                proxy_pass https://api-cn.faceplusplus.com/facepp/v3;
-        }
-
-        location ^~ /jenkins {
-                proxy_pass http://localhost:9000/jenkins;
-        }
-
-        location ^~ /resource.js {
-                proxy_pass http://basic/resource.js;
-        }
-
-
-        location ^~ /api/ecs_core/ {
-                proxy_pass http://basic;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_exam_work/ {
-                proxy_pass http://examwork;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_ques/ {
-                proxy_pass http://question-for-student;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location  /api/branch_ecs_ques/ {
-                proxy_pass http://question-for-student/api/ecs_ques/;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-        }
-
-        location ^~ /api/ecs_oe_student/ {
-                proxy_pass http://oe-student;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_oe_admin/ {
-                proxy_pass http://oe-admin-for-student;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location  /api/branch_ecs_oe_admin/ {
-                proxy_pass http://oe-admin-for-student/api/ecs_oe_admin/;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
-        location ^~ /api/ecs_oe_student_face/ {
-                proxy_pass http://oe-task;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ws/ {
-                proxy_pass http://ws;
-                        proxy_http_version 1.1;
-                proxy_connect_timeout 60s;
-                proxy_read_timeout 3600s;
-                proxy_send_timeout 12s;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-        }
-
-        location ^~ /api/ecs_marking/ {
-                proxy_pass http://marking;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_data_process/ {
-                proxy_pass http://logic-marking;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_outlet/ {
-                proxy_pass http://exchange;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/exchange/ {
-                proxy_pass http://exchange/;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/exchange/outer/ {
-                proxy_pass http://exchange;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/exchange/inner/ {
-                proxy_pass http://exchange;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /cmcClient/ {
-                proxy_pass http://bridge;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/app-api/ {
-                proxy_pass http://app-api;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ctr/task/ {
-                proxy_pass http://task;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_prt/ {
-                proxy_pass http://print;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/ecs_reports/ {
-                proxy_pass http://reports;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-
-        location ^~ /api/limiter/ {
-                proxy_pass http://api-limiter;
-                        proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
-}
-