Code Review
/
holmes
/
rule-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bugfix - rule creation failure on GUI
[holmes/rule-management.git]
/
rulemgt-standalone
/
src
/
main
/
assembly
/
nginx-https.conf
diff --git
a/rulemgt-standalone/src/main/assembly/nginx-https.conf
b/rulemgt-standalone/src/main/assembly/nginx-https.conf
index
fda1ab1
..
dafb571
100644
(file)
--- a/
rulemgt-standalone/src/main/assembly/nginx-https.conf
+++ b/
rulemgt-standalone/src/main/assembly/nginx-https.conf
@@
-4,6
+4,7
@@
worker_processes 1;
error_log logs/error.log;
error_log logs/error.log notice;
error_log logs/error.log info;
error_log logs/error.log;
error_log logs/error.log notice;
error_log logs/error.log info;
+#error_log logs/error.log debug;
pid logs/nginx.pid;
pid logs/nginx.pid;
@@
-14,7
+15,7
@@
events {
http {
http {
- include mime.types;
+ include
../
mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@@
-35,19
+36,19
@@
http {
server_name _;
location / {
server_name _;
location / {
- root /usr/
local/openresty
/nginx/html;
+ root /usr/
share
/nginx/html;
- proxy_set_header Host $host;
+ proxy_set_header Host $
proxy_
host;
proxy_set_header X-Real-IP $remote_addr;
proxy_redirect off;
if ($uri ~ "/api/holmes-rule-mgmt/(.*)") {
proxy_set_header X-Real-IP $remote_addr;
proxy_redirect off;
if ($uri ~ "/api/holmes-rule-mgmt/(.*)") {
- proxy_pass http
s://$host:9101
$request_uri;
+ proxy_pass http
://msb-iag.onap
$request_uri;
break;
}
if ($uri ~ "/api/holmes-engine-mgmt/(.*)") {
break;
}
if ($uri ~ "/api/holmes-engine-mgmt/(.*)") {
- proxy_pass http
s://$host:9102
$request_uri;
+ proxy_pass http
://msb-iag.onap
$request_uri;
break;
}
}
break;
}
}
@@
-57,8
+58,8
@@
http {
root html;
}
root html;
}
- ssl_certificate /etc/ssl/
public
/holmes-frontend-selfsigned.crt;
+ ssl_certificate /etc/ssl/
certs
/holmes-frontend-selfsigned.crt;
ssl_certificate_key /etc/ssl/private/holmes-frontend.key;
ssl_certificate_key /etc/ssl/private/holmes-frontend.key;
- ssl_dhparam /etc/ssl/
public
/dhparam.pem;
+ ssl_dhparam /etc/ssl/
certs
/dhparam.pem;
}
}
}
}