0.0.11

New version
Hydrospheredata · Oct 24, 2017 · 99cd00f · 99cd00f
2 parents 5eb341b + 3b536e3
commit 99cd00f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/docker/nginx/bin/configure-nginx.sh b/docker/nginx/bin/configure-nginx.sh
@@ -7,5 +7,3 @@ conf_file='/etc/nginx/nginx.conf'
 # Stay alive to allow Docker to manage it
 echo "daemon off;" >> "${conf_file}"
 
-# Only include .conf files to ignore supplemental files like keys
-sed -i 's@sites-enabled/\*@sites-enabled/*.conf@' "${conf_file}"
diff --git a/docker/nginx/bin/entrypoint.sh b/docker/nginx/bin/entrypoint.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-sed -i "s/MANAGER_HOST/${MANAGER_HOST}/g" /etc/nginx/sites-templates/manager.conf.tmpl
+sed -i "s/MANAGER_HOST/$MANAGER_HOST/g" /etc/nginx/sites-templates/manager.conf.tmpl
 rm /etc/nginx/conf.d/default.conf
 cp /etc/nginx/sites-templates/manager.conf.tmpl /etc/nginx/conf.d/manager.conf
 exec $@
diff --git a/docker/nginx/config/manager.conf.tmpl b/docker/nginx/config/manager.conf.tmpl
@@ -7,48 +7,48 @@ server {
   }
   error_page 404 =200 /index.html;
 
-  location /${MANAGER_HOST} {
-    proxy_pass http://${MANAGER_HOST};
+  location /manager {
+    proxy_pass http://MANAGER_HOST;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header Upgrade $http_upgrade;
     proxy_http_version 1.1;
   }
 
   location /v1/prometheus {
-    proxy_pass http://${MANAGER_HOST};
+    proxy_pass http://MANAGER_HOST;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header Upgrade $http_upgrade;
     proxy_http_version 1.1;
   }
 
   location /api/v1 {
-    proxy_pass http://${MANAGER_HOST};
+    proxy_pass http://MANAGER_HOST;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header Upgrade $http_upgrade;
     proxy_http_version 1.1;
   }
 
   location /ui/v1 {
-    proxy_pass http://${MANAGER_HOST};
+    proxy_pass http://MANAGER_HOST;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header Upgrade $http_upgrade;
     proxy_http_version 1.1;
   }
 
   location /api-docs {
-    proxy_pass http://${MANAGER_HOST};
+    proxy_pass http://MANAGER_HOST;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header Upgrade $http_upgrade;
     proxy_http_version 1.1;
   }
 
   location /swagger {
-    proxy_pass http://${MANAGER_HOST};
+    proxy_pass http://MANAGER_HOST;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header Upgrade $http_upgrade;

diff --git a/version b/version
@@ -1 +1 @@
-0.0.10-SNAPSHOT
+0.0.11-SNAPSHOT