[taler-deployment] branch master updated (f241499 -> f8e3b16)

[gnunet]

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

ms pushed a change to branch master
in repository deployment.

    from f241499  deploy landing
     new 8ce33e2  readme
     new 6a9be61  import backup script
     new f8e3b16  backend url in config

The 3 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:
 docker/hybrid/README                     | 55 ++++++++++++++++++++++++++++++++
 docker/hybrid/backup.sh                  |  2 +-
 docker/hybrid/config/deployment.conf     |  1 +
 docker/hybrid/images/merchant/startup.sh |  2 ++
 docker/hybrid/images/merchant/taler.conf |  3 +-
 5 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/docker/hybrid/README b/docker/hybrid/README
index 8621947..b7c8f64 100644
--- a/docker/hybrid/README
+++ b/docker/hybrid/README
@@ -55,6 +55,11 @@ run the following command to export database, key material, 
and logs:
 
   $ ./backup.sh
 
+The following command imports a TAR backup into
+the Docker volumes.  From this directory:
+
+  $ ./import-backup.sh
+
 Run
 ---
 
@@ -121,3 +126,53 @@ Nginx configuration example deploys this sandbox under
       proxy_pass http://localhost:15000/;
     }
   }
+
+  server {
+    server_name blog.example.com;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+   
+    location / {
+      proxy_set_header X-Forwarded-Host "blog.example.com";
+      proxy_set_header X-Forwarded-Proto "https";
+      proxy_set_header X-Forwarded-Prefix /;
+      proxy_pass http://localhost:5559/;
+    }
+  }
+
+  server {
+    server_name donations.example.com;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+   
+    location / {
+      proxy_set_header X-Forwarded-Host "donations.example.com";
+      proxy_set_header X-Forwarded-Proto "https";
+      proxy_set_header X-Forwarded-Prefix /;
+      proxy_pass http://localhost:5560/;
+    }
+  }
+
+  server {
+    server_name survey.example.com;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+   
+    location / {
+      proxy_set_header X-Forwarded-Host "survey.example.com";
+      proxy_set_header X-Forwarded-Proto "https";
+      proxy_set_header X-Forwarded-Prefix /;
+      proxy_pass http://localhost:5561/;
+    }
+  }
+
+  # Landing page that explains the demo.
+  server {
+    server_name intro.example.com;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+   
+    location / {
+      proxy_pass http://localhost:5562/;
+    }
+  }
diff --git a/docker/hybrid/backup.sh b/docker/hybrid/backup.sh
index ae0fe75..544e716 100755
--- a/docker/hybrid/backup.sh
+++ b/docker/hybrid/backup.sh
@@ -24,6 +24,6 @@ docker run \
   -v hybrid_talerdata:/taler-data \
   -v hybrid_talerlogs:/taler-logs \
   -it debian:stable \
-  /bin/bash -c "tar --no-same-owner --no-same-permissions -c -f ${BACKUP_FILE} 
/taler-data /taler-logs && chown $(id --user):$(id --group) ${BACKUP_FILE}"
+  /bin/bash -c "tar --no-same-owner --no-same-permissions -c -f ${BACKUP_FILE} 
/taler-data /taler-logs && chown $(id --user):$(id --group) ${BACKUP_FILE}" > 
/dev/null
 
 echo Backup at: ${BACKUP_FILE}
diff --git a/docker/hybrid/config/deployment.conf 
b/docker/hybrid/config/deployment.conf
index fb3e5c0..6b4d052 100644
--- a/docker/hybrid/config/deployment.conf
+++ b/docker/hybrid/config/deployment.conf
@@ -1,6 +1,7 @@
 [taler-deployment]
 currency = EUR
 merchant-apikey = secret
+merchant-url = http://localhost:5556/
 exchange-nexus-username = exchange-at-nexus
 exchange-nexus-password = secret-at-nexus
 
diff --git a/docker/hybrid/images/merchant/startup.sh 
b/docker/hybrid/images/merchant/startup.sh
index 49dcff1..ddf3af2 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -6,6 +6,7 @@ export LD_LIBRARY_PATH=/usr/local/lib
 # Values from config file mounted at run time:
 CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o 
currency`
 BACKEND_APIKEY=`taler-config -c /config/deployment.conf -s taler-deployment -o 
merchant-apikey`
+BACKEND_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o 
merchant-url`
 EXCHANGE_URL="http://exchange/";
 DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o 
db-password`
 
@@ -63,6 +64,7 @@ sed -i "s;__EXCHANGE_URL__;${EXCHANGE_URL};" 
/config/taler.conf
 sed -i "s/__EXCHANGE_PUB__/${EXCHANGE_MASTER_PUB}/" /config/taler.conf
 sed -i "s/__CURRENCY__/${CURRENCY}/" /config/taler.conf
 sed -i "s/__BACKEND_APIKEY__/${BACKEND_APIKEY}/" /config/taler.conf
+sed -i "s/__BACKEND_URL__/${BACKEND_URL}/" /config/taler.conf
 sed -i "s;__DB_PASSWORD__;${DB_PASSWORD};" /config/taler.conf
 echo -n "Reset database..."
 taler-merchant-dbinit -L DEBUG -c /config/taler.conf --reset
diff --git a/docker/hybrid/images/merchant/taler.conf 
b/docker/hybrid/images/merchant/taler.conf
index 6e282e3..a85510e 100644
--- a/docker/hybrid/images/merchant/taler.conf
+++ b/docker/hybrid/images/merchant/taler.conf
@@ -23,7 +23,6 @@ serve = tcp
 wire_file_mode = 770
 wire_response = ${TALER_DATA_HOME}/merchant/wire/merchant.json
 
-# Unused yet.
 [frontends]
-backend = http://localhost:5556/
+backend = __BACKEND_URL__
 backend_apikey = __BACKEND_APIKEY__

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.