[GNUnet-SVN] [taler-deployment] branch master updated (d2cda72 -> 5adf92d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a change to branch master
in repository deployment.

    from d2cda72  include the twister so as to trigger the "switcher" builds.
     new a2f79f8  Backoffice config.
     new 6e6093b  ARM entry for backoffice.
     new 00f761e  ARM starting backoffice.
     new 5adf92d  Backoffice block at Nginx.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/taler-deployment-start        |  1 +
 config/generate-config            | 12 ++++++++----
 etc/nginx/sites-enabled/test.site | 33 +++++++++++++++++++++++++++++++++
 taler-arm/taler-backoffice.conf   |  4 ++++
 4 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 taler-arm/taler-backoffice.conf

diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
index 29fb077..1e6f26b 100755
--- a/bin/taler-deployment-start
+++ b/bin/taler-deployment-start
@@ -33,6 +33,7 @@ taler-deployment-arm -i taler-blog
 taler-deployment-arm -i taler-survey
 taler-deployment-arm -i taler-aggregator
 taler-deployment-arm -i taler-exchange-wirewatch
+taler-deployment-arm -i taler-backoffice
 
 if [[ "$TALER_ENV_NAME" = test ]]; then
   taler-deployment-arm -i taler-playground
diff --git a/config/generate-config b/config/generate-config
index 48bcaab..67e2011 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -87,11 +87,15 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("playground", "uwsgi_unixpath_mode", "660")
 
     if standalone:
-        cfg_put("backoffice-blog", "backend", 
"https://env.taler.net/{}/merchant-backend/".format(envname))
-        cfg_put("backoffice-donations", "backend", 
"https://env.taler.net/{}/merchant-backend/".format(envname))
+        cfg_put("backoffice-all", "backend", 
"https://env.taler.net/{}/merchant-backend/".format(envname))
     else:
-        cfg_put("backoffice-blog", "backend", 
"https://backend.{}.taler.net/".format(envname))
-        cfg_put("backoffice-donations", "backend", 
"https://backend.{}.taler.net/".format(envname))
+        cfg_put("backoffice-all", "backend", 
"https://backend.{}.taler.net/".format(envname))
+    
+    # Keep only one back-office service for all instances, for simplicity.
+    cfg_put("backoffice-all", "uwsgi_serve", "unix")
+    cfg_put("backoffice-all", "uwsgi_unixpath_mode", "660")
+    cfg_put("backoffice-all", "uwsgi_unixpath", 
"$HOME/sockets/backoffice.uwsgi")
+    cfg_put("backoffice-all", "instances", "FSF default Tor")
 
     cfg_put("merchant", "wireformat", "test")
     cfg_put("merchant", "serve", "unix")
diff --git a/etc/nginx/sites-enabled/test.site 
b/etc/nginx/sites-enabled/test.site
index c9f7b6f..472deb4 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -8,6 +8,7 @@ server {
               survey.test.taler.net
               auditor.test.taler.net
               exchange.test.taler.net;
+              backoffice.test.taler.net;
 
   # 301-based ridirects allows the user agent to *change* the
   # method used in the second request.  This breaks all the API
@@ -344,3 +345,35 @@ server {
 
   include conf.d/favicon_robots;
 }
+
+server {
+  server_name backoffice.test.taler.net;
+  listen 443 ssl;
+  listen [::]:443 ssl;
+  include conf.d/talerssl;
+
+  location @blue {
+    add_header X-Taler-Deployment-Color blue;
+    uwsgi_pass unix:/home/test-blue/sockets/backoffice.uwsgi;
+    include /etc/nginx/uwsgi_params;
+  }
+  location @green {
+    add_header X-Taler-Deployment-Color green;
+    uwsgi_pass unix:/home/test-green/sockets/backoffice.uwsgi;
+    include /etc/nginx/uwsgi_params;
+  }
+
+  location / {
+    # Redirection technique explainted at
+    # https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
+    error_page 418 = @blue;
+    error_page 419 = @green;
+    recursive_error_pages on;
+    if ($http_x_taler_deployment_color ~ "blue") { return 418; }
+    if ($http_x_taler_deployment_color ~ "green") { return 419; }
+    uwsgi_pass unix:/home/test/sockets/backoffice.uwsgi;
+    include /etc/nginx/uwsgi_params;
+  }
+
+  include conf.d/favicon_robots;
+}
diff --git a/taler-arm/taler-backoffice.conf b/taler-arm/taler-backoffice.conf
new file mode 100644
index 0000000..1b38bb2
--- /dev/null
+++ b/taler-arm/taler-backoffice.conf
@@ -0,0 +1,4 @@
+[taler-backoffice]
+TYPE = simple
+BINARY = taler-log-adapter
+OPTIONS = $HOME/logs/backoffice-%Y-%m-%d.log taler-merchant-backoffice -f all 
serve-uwsgi

-- 
To stop receiving notification emails like this one, please contact
address@hidden