diff options
| author |   tang peng <tang.peng5@zte.com.cn> | 2018-11-06 11:37:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-06 11:37:15 +0000 |
| commit | 6329754d97a2743a85da513233e7d7979dd61d05 (patch) | |
| tree | 535a120d78b0e4e79ba0fd7b3f7453526d8d24bf /rulemgt-standalone/src/main/assembly | |
| parent | 1548160d70f280414f8a1974d0543b6707884814 (diff) | |
| parent | 53e45682d0fc4de09ab09a98fa44c5db5155cb4b (diff) | |
Merge "Updated the UI to HTTPS"
Diffstat (limited to 'rulemgt-standalone/src/main/assembly')
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/run.sh | 8 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/nginx.conf | 24 |
2 files changed, 20 insertions, 12 deletions
diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh index f800eb4..daa803c 100644 --- 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 --- 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){ |