fuyu 3 лет назад
Родитель
Сommit
8196339d0e
2 измененных файлов с 3 добавлено и 2 удалено
  1. 2 2
      https.d/html-https.conf
  2. 1 0
      nginx.conf

+ 2 - 2
https.d/html-https.conf

@@ -11,14 +11,14 @@ server {
   access_log  /home/openlab/data/logs/nginx/html/access.log;
   error_log   /home/openlab/data/logs/nginx/html/error.log;
 	index	index.html index.htm;
-	root /home/openlab/data/www/ris/client;
+	root /home/openlab/data/www/ris/client_ssl;
 
 
   location /zskkapi/ {
       # add_header Access-Control-Allow-Origin '*';
       # add_header Access-Control-Allow-Headers 'X-Requested-With,Content-Type';
       # add_header Access-Control-Allow-Methods 'GET,POST,OPTIONS';
-      proxy_pass              http://127.0.0.1:9600/;#ris3.0后台
+      proxy_pass              https://127.0.0.1:19600/;#ris3.0后台
       #proxy_set_header        Host $host;
       proxy_set_header        X-Real-IP $remote_addr;
       proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;

+ 1 - 0
nginx.conf

@@ -21,4 +21,5 @@ http {
     sendfile        	on;
     keepalive_timeout  	65;
     include conf.d/*.conf;
+    include https.d/*.conf;
 }