--- a/deploy/deploy.sh Mon Sep 17 18:35:17 2018 +0200
+++ b/deploy/deploy.sh Tue Sep 18 10:36:57 2018 +0200
@@ -21,6 +21,7 @@
case $DASHBOARDNAME in
explorunivers_test) DASHBOARDNAMEOK=true;;
+ explorunivers) DASHBOARDNAMEOK=true;;
*) DASHBOARDNAMEOK=false;;
esac
--- a/deploy/group_vars/group_vars.yml.tmpl Mon Sep 17 18:35:17 2018 +0200
+++ b/deploy/group_vars/group_vars.yml.tmpl Tue Sep 18 10:36:57 2018 +0200
@@ -59,11 +59,16 @@
annotations_api_host:
# annotations api service port
annotations_api_port:
+# annotations_api_upstream_name
+annotations_api_upstream_name: annotation-api-<name>
# discussions service host
discussions_host:
# discussions service port
discussions_port: 8201
+# discussions_api_upstream_name
+discussions_api_upstream_name: discussions-api-<name>
+
# annotations api hypothesis token
annotations_api_hypothesis_token:
--- a/deploy/templates/nginx.static.conf.j2 Mon Sep 17 18:35:17 2018 +0200
+++ b/deploy/templates/nginx.static.conf.j2 Tue Sep 18 10:36:57 2018 +0200
@@ -1,9 +1,9 @@
-upstream annotation-api {
+upstream {{annotations_api_upstream_name}} {
server {{annotations_api_host}}:{{annotations_api_port}};
server 127.0.0.1 backup;
}
-upstream discussion-api {
+upstream {{discussions_api_upstream_name}} {
server {{discussions_host}}:{{discussions_port}};
server 127.0.0.1 backup;
}
@@ -23,12 +23,12 @@
location {{annotations_api_url}}/ {
- uwsgi_pass annotation-api;
+ uwsgi_pass {{annotations_api_upstream_name}};
include /etc/nginx/uwsgi_params;
}
location {{discussions_url}}/ {
- uwsgi_pass discussion-api;
+ uwsgi_pass {{discussions_api_upstream_name}};
include /etc/nginx/uwsgi_params;
}
--- a/deploy/templates/nginx.static.ssl.conf.j2 Mon Sep 17 18:35:17 2018 +0200
+++ b/deploy/templates/nginx.static.ssl.conf.j2 Tue Sep 18 10:36:57 2018 +0200
@@ -1,9 +1,9 @@
-upstream annotation-api {
+upstream {{annotations_api_upstream_name}} {
server {{annotations_api_host}}:{{annotations_api_port}};
server 127.0.0.1 backup;
}
-upstream discussion-api {
+upstream {{discussions_api_upstream_name}} {
server {{discussions_host}}:{{discussions_port}};
server 127.0.0.1 backup;
}
@@ -44,12 +44,12 @@
}
location {{annotations_api_url}}/ {
- uwsgi_pass annotation-api;
+ uwsgi_pass {{annotations_api_upstream_name}};
include /etc/nginx/uwsgi_params;
}
location {{discussions_url}}/ {
- uwsgi_pass discussion-api;
+ uwsgi_pass {{discussions_api_upstream_name}};
include /etc/nginx/uwsgi_params;
}