sync

nginx/test-192.168.1.91/nginx.conf

@@ -15,10 +15,10 @@ http {
 	sendfile on;
 
 
-	# log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-	# '$status $body_bytes_sent "$http_referer" '
-	# '"$http_user_agent" "$http_x_forwarded_for"';
-	# access_log  logs/access.log  main;
+#	 log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+#	 '$status $body_bytes_sent "$http_referer" '
+#	 '"$http_user_agent" "$http_x_forwarded_for"';
+#	 access_log  logs/access.log  main;
 	access_log off;
 
 
@@ -35,6 +35,7 @@ http {
 
 	# =====================================================================
 
+	#error_page  404              /40x.html;
 	upstream basic {
 		server 192.168.1.91:8000;
 	}
@@ -106,7 +107,13 @@ http {
 	# =====================================================================
 
 	include sites/http80.conf;
-	# include sites/https443.conf;
+	include sites/gogs.conf;
+	include sites/pan.conf;
+	include sites/log.conf;
+	include sites/online-exam-test.conf;
+	include sites/online-exam-test-mobile.conf;
+
+#	include sites/https443.conf;
 	include sites/block_ips.conf;
 
 }

nginx/test-192.168.1.91/sites/gogs.conf

@@ -0,0 +1,11 @@
+server {
+       listen       80;
+
+        server_name  git.qmth.com.cn;
+
+        location / {
+                      proxy_pass http://127.0.0.1:3000;
+        }
+}
+
+

nginx/test-192.168.1.91/sites/http80.conf

@@ -1,7 +1,7 @@
 server {
 	listen 80;
 	charset utf-8;
-	error_page 404 /40x.html;
+        error_page 404  /40x.html;
 
 
 	location = / {
@@ -31,15 +31,15 @@ server {
 		try_files $uri $uri/ /oe-web/index.html;
 	}
 
+	location ^~ /oe-web/(js|css|img|fonts|models) {
+		root /home/admin/project/examcloud/static-new/oe-web/dist/;
+	}
+
 	location ^~ /oe-web/js/ {
 		alias /home/admin/project/examcloud/static-new/oe-web/dist/js/;
 		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;
 	}
@@ -78,4 +78,9 @@ server {
 		proxy_pass http://basic/resource.js;
 	}
 
+        location ^~ /api-doc/ {
+                alias /home/admin/project/examcloud/static-new/api-doc/;
+        }
+
 }
+

nginx/test-192.168.1.91/sites/http80.conf-bak

@@ -0,0 +1,82 @@
+server {
+	listen 80;
+	charset utf-8;
+    error_page 404  /40x.html;
+
+
+	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/dist/;
+		try_files $uri $uri/ /oe-web/index.html;
+	}
+
+	location ^~ /oe-web/(js|css|img|fonts|models) {
+		root /home/admin/project/examcloud/static-new/oe-web/dist/;
+	}
+
+
+	location ^~ /oe-web/js/ {
+		alias /home/admin/project/examcloud/static-new/oe-web/dist/js/;
+		try_files $uri $uri/ =404;
+	}
+
+	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;
+	}
+
+}

nginx/test-192.168.1.91/sites/https443.conf → nginx/test-192.168.1.91/sites/https443-bak

@@ -1,10 +1,9 @@
 server {
 	listen 443 ssl;
 	charset utf-8;
-	error_page 404 /40x.html;
 
-	ssl_certificate ssl/ea100/cert.pem;
-	ssl_certificate_key ssl/ea100/key.pem;
+	ssl_certificate ssl/ea100/nginx.pem;
+	ssl_certificate_key ssl/ea100/nginx.key;
 
 	ssl_session_cache	shared:SSL:1m;
 	ssl_session_timeout	5m;
@@ -25,11 +24,6 @@ server {
 		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;
 	}
@@ -39,15 +33,6 @@ server {
 		try_files $uri $uri/ /oe-web/index.html;
 	}
 
-	location ^~ /oe-web/js/ {
-		alias /home/admin/project/examcloud/static-new/oe-web/dist/js/;
-		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;
 	}
@@ -86,7 +71,6 @@ server {
 		proxy_pass http://basic/resource.js;
 	}
 
-
 	location ^~ /api/ecs_core/ {
 		proxy_pass http://basic;
 			proxy_set_header X-Real-IP $remote_addr;

nginx/test-192.168.1.91/sites/log.conf

@@ -0,0 +1,11 @@
+server {
+       listen       80;
+
+        server_name  log.qmth.com.cn;
+
+        location / {
+                      proxy_pass http://127.0.0.1:29000;
+        }
+}
+
+

nginx/test-192.168.1.91/sites/online-exam-test-mobile.conf

@@ -0,0 +1,11 @@
+server {
+       listen       80;
+
+        server_name  mobile.online-exam-test.cn;
+
+        location / {
+                      proxy_pass http://127.0.0.1:18002;
+        }
+}
+
+

nginx/test-192.168.1.91/sites/online-exam-test.conf

@@ -0,0 +1,11 @@
+server {
+       listen       80;
+
+        server_name  admin.online-exam-test.cn;
+
+        location / {
+                      proxy_pass http://127.0.0.1:10080;
+        }
+}
+
+

nginx/test-192.168.1.91/sites/pan.conf

@@ -0,0 +1,11 @@
+server {
+       listen       80;
+
+        server_name  pan.qmth.com.cn;
+
+        location / {
+                      proxy_pass http://127.0.0.1:10080;
+        }
+}
+
+

nginx/test-192.168.1.91/ssl/ea100/nginx.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAuQ3T+EjU5rJLA4K0O6y5VayjLV+LJg4Ii+VF8bWYQkzF6Krh
+mhi64R4T7PH+vPuLOklfcMo+/SgIc14P03dLj/4VRksGTXFnKj69m25nQSfXBg8i
+AYPze/dJVBFCya238YbJ2ZBaBdOQawqA1wuPJ2rvWRczZwUAR6k6oq2YXA7Eg6Vj
+1Zk08SG8voheKj2x60wrzn7W4UpXK5mgfBYWgUst0lHB1PI5+7ROqxtJYxt0kk+K
+Jj8uCvE7CSqY3dJIX+wLm75EuhqPnq7lqXEJsoMtKwxvGYa3Rvp1YnR/k5efoOOw
+P5gMm6tEMP5j+ssUkNDCvcNckvXqvtX//GkIcwIDAQABAoIBAFdgEBXLTbsftAuU
+S0Vh6KBrQyDJXAo71g031C6sb5feaBPTm3IG+zYP3ZijKoRQwQxkWIwI8nTV0iem
+4hIW4ba7YZAvHGq0gOGRfjVFi7tX9E8IFiZhBzYhLJ5lCAPx4khIPEZdwiO+IRJp
+gywGaTFTbG/EZKDf26H6ZZUqIiZUhN59v6rwoL3rE5nZA2JTt1blPV2+i0Qb0DBu
+c01GLDGSadyE7oagynTeAKhJN0m/xA8zu9/M/LvqvEVSf+l9/Vj9vqVZoAM22If3
+aYshFZ7bJMvPTbAYYLEwdj4owX3g32s7giL9Pwsg/eOpbIaWLa6uCp0F6S7yfWyr
+2KvPtQECgYEA5bYQoFLMuSZFioM2pASZdzs2Jpn8FEaUb8Z9AVkes6Pi5mUnrfK7
+0cfRd7NAgtKWg4uD9ywLxSCM4oQaEzJ+QdhCyqmj6VQvQpdU3P8iv9Y7+nc+tXCj
+O/YtMTIyhA66oqCMQQXqp1nyrE0SJI0caDsXOYhQu8PtzkMFz+Zl5uUCgYEAzjts
+zcOGO1dWXATxpphYkSs3eWZQpoU1Vr9l7DXRDbAmIfmd8NfC1zZ2pjRlxAZmpbe0
++ttrCHpYwxNe1z2+qFvBafRI5//OetaCIP/+ETUXQCV5VAGGa532gPT3EKScrgKA
+W6Wx4RWCgzPQDULFzWL/N5QWLxB1FIxqOFygpHcCgYBXKCdSzVfEAFNuZK68uMoJ
+xTucldxhTQ5RAry3YDsX6dzTkhnmFC1TQT+m7SpS+NgG/U6K3/lvSBRsdbb3BbeG
+ACoHfyokA78Swxx95YgnxX9oXwo6CYzF2Xf4LJWiKXyC6+uLWFVaPfSnj26M08Wt
+fo4nVCNdus9l7WQtJ7wOSQKBgQCzo3Os8Al2mybwVKYhlUZgfSJ/Lq5Fvnatr16a
+mG4W3D77DTGUXnyrdhd3wuB6FZFH/HM6p/HdmqTCl5bfKjtu7y3UmyL+YwZ6XWtQ
+T2wBlRtBluLOV9281AWqYrbq2lhYAnnIWtZM162tl248ftNJilgBE48XQ+CYG49S
+tOyBFQKBgG6mQaBkj0gwMtVeZUbY04wUgp+Njl95tgomKnljUJVbcAm2nEEi0kM6
+6XuVyK5DHP6ZzFOVE8H/mMDshsQ8nzg2hBW/m/jHYpqz7U7MAVKLPc1wgfHbz7Hs
+NAVYvUmyzrB5R8Fxku250yTBFcz8Hk/WRYwL8NUt+DkCYH1J6Bko
+-----END RSA PRIVATE KEY-----

nginx/test-192.168.1.91/ssl/ea100/nginx.pem

@@ -0,0 +1,59 @@
+-----BEGIN CERTIFICATE-----
+MIIFVDCCBDygAwIBAgISA5K0fbdOPZhokmCkLFnGyQDwMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjIwODM2NTJaFw0y
+MTAxMjAwODM2NTJaMBkxFzAVBgNVBAMMDiouZWExMDAuY29tLmNuMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuQ3T+EjU5rJLA4K0O6y5VayjLV+LJg4I
+i+VF8bWYQkzF6Krhmhi64R4T7PH+vPuLOklfcMo+/SgIc14P03dLj/4VRksGTXFn
+Kj69m25nQSfXBg8iAYPze/dJVBFCya238YbJ2ZBaBdOQawqA1wuPJ2rvWRczZwUA
+R6k6oq2YXA7Eg6Vj1Zk08SG8voheKj2x60wrzn7W4UpXK5mgfBYWgUst0lHB1PI5
++7ROqxtJYxt0kk+KJj8uCvE7CSqY3dJIX+wLm75EuhqPnq7lqXEJsoMtKwxvGYa3
+Rvp1YnR/k5efoOOwP5gMm6tEMP5j+ssUkNDCvcNckvXqvtX//GkIcwIDAQABo4IC
+YzCCAl8wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSKjsKREmGEISBLjvus5E9KE9/U
+XTAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRj
+MGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5v
+cmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5v
+cmcvMBkGA1UdEQQSMBCCDiouZWExMDAuY29tLmNuMEwGA1UdIARFMEMwCAYGZ4EM
+AQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0
+c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUAb1N2rDHwMRnY
+mQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF1T6sQtgAABAMARjBEAiBIBjw8OipX
+DPncxG4B5WhD/sVDv3n5DERQH5LX9UKwqAIgeX4QvZSNe3MkMxRCemVnHEVWybIX
+XmsrMC3lBZSfg5EAdwD2XJQv0XcwIhRUGAgwlFaO400TGTO/3wwvIAvMTvFk4wAA
+AXVPqxCJAAAEAwBIMEYCIQCewps53TgHndeteZxFldYZEV2ko6Ab/qts2KcQNvK4
+GAIhAJvnJIfVKYkrQWtbsVgKaENK5PsLxkwI+ybSqgaMe8cKMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmDplWNqt2O1NGalm0NfbxyQnU609qY0P8BosiYuKyEab3+DWcL8Tr
+n3G7AxIpTd4g0lRk2JhB645LJgReAknLEIQFFix/5wC0Mjd0szE+auHtRxj0pFBp
+RvknbE2XmrADd8RidHRHyPc7Lx8O7IH3VzRDO6zJmos9CamsT77nGE+sYxOmLZmZ
+BenhgZ7077jts0F0aHUDchb18rwxA7RHC2fi0/laX1iRb5PQGQe6pp2mLh/PAsXD
+zJdKUgabLASsSwiFDS5MM4oJk3bRXHmCQLdYHkf0BRrjWCR4CRsHI7xEc1sclmj1
+c6Xc+MKmhflnmmMNho9YMh0+1vGhsMhI
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----