Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improved error msg for missing images
[nonrtric.git]
/
test
/
simulator-group
/
control_panel
/
nginx.conf
diff --git
a/test/simulator-group/control_panel/nginx.conf
b/test/simulator-group/control_panel/nginx.conf
index
0014ffb
..
1672ad0
100644
(file)
--- a/
test/simulator-group/control_panel/nginx.conf
+++ b/
test/simulator-group/control_panel/nginx.conf
@@
-18,17
+18,23
@@
events{}
http {
include /etc/nginx/mime.types;
http {
include /etc/nginx/mime.types;
- resolver 127.0.0.11;
+
+ resolver ${CP_NGINX_RESOLVER};
+
server {
listen 8080;
server_name localhost;
root /usr/share/nginx/html;
index index.html;
server {
listen 8080;
server_name localhost;
root /usr/share/nginx/html;
index index.html;
- location /a1-policy/ {
+ location ${CONTROL_PANEL_PATH_POLICY_PREFIX} {
+ set $upstream ${NGW_DOMAIN_NAME};
+ proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
+ }
+ location ${CONTROL_PANEL_PATH_ECS_PREFIX} {
set $upstream ${NGW_DOMAIN_NAME};
proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
}
set $upstream ${NGW_DOMAIN_NAME};
proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
}
- location
/ei-producer/
{
+ location
${CONTROL_PANEL_PATH_ECS_PREFIX2}
{
set $upstream ${NGW_DOMAIN_NAME};
proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
}
set $upstream ${NGW_DOMAIN_NAME};
proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
}