Updated the UI to HTTPS

Change-Id: I6964b5d175dd7cca308f4848e865477b43df8f20
Issue-ID: HOLMES-181
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index f800eb4..daa803c 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -82,10 +82,10 @@ sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf
 
 
 #Register the fronten to MSB
-body='{"serviceName":"holmes","version":"v1","url":"/iui/holmes","nodes":[{"ip":"host_ip","port":"9104","lb_server_params":"","checkType":"","checkUrl":"","checkInterval":"","checkTimeOut":"","ttl":"","ha_role":""}],"protocol":"UI","visualRange":"0|1","lb_policy":"","publish_port":"","namespace":"","network_plane_type":"","host":"","path":"","labels":[],"metadata":[]}'
-msg_body=${body/host_ip/"${HOSTNAME%:*}"}
-curl -X POST -H "Content-Type: application/json" -d ${msg_body} http://${MSB_ADDR}/api/msdiscover/v1/services?is_manual=true
-echo Registered UI to MSB.
+#body='{"serviceName":"holmes","version":"v1","url":"/iui/holmes","nodes":[{"ip":"host_ip","port":"9104","lb_server_params":"","checkType":"","checkUrl":"","checkInterval":"","checkTimeOut":"","ttl":"","ha_role":""}],"protocol":"UI","visualRange":"0|1","lb_policy":"","publish_port":"","namespace":"","network_plane_type":"","host":"","path":"","labels":[],"metadata":[]}'
+#msg_body=${body/host_ip/"${HOSTNAME%:*}"}
+#curl -X POST -H "Content-Type: application/json" -d ${msg_body} http://${MSB_ADDR}/api/msdiscover/v1/services?is_manual=true
+#echo Registered UI to MSB.
 
 
 nginx -c /usr/local/openresty/nginx/conf/nginx.conf

diff --git a/rulemgt-standalone/src/main/assembly/nginx.conf b/rulemgt-standalone/src/main/assembly/nginx.conf
index a41168a..e4facf1 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/nginx.conf
+++ b/rulemgt-standalone/src/main/assembly/nginx.conf
@@ -31,17 +31,25 @@ http {
     ssl_session_timeout 10m;
 
     server {
-        listen       9104;
-        server_name  localhost;
-        return 302 https://$server_name$request_uri;
-        }
-
-    server {
-        listen       9105 ssl;
-        server_name  localhost;
+        listen       9104 ssl;
+        server_name  _;
 
         location / {
             root   /usr/local/openresty/nginx/html;
+
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_redirect off;
+
+            if ($uri ~ "/api/holmes-rule-mgmt/(.*)") {
+                proxy_pass https://$host:9101$request_uri;
+                break;
+            }
+
+            if ($uri ~ "/api/holmes-engine-mgmt/(.*)") {
+                proxy_pass https://$host:9102$request_uri;
+                break;
+            }
         }
 
         location ~*.(htm|html){