[GNUnet-SVN] [taler-deployment] branch master updated (9121628 -> 926b542)

[gnunet]

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

marcello pushed a change to branch master
in repository deployment.

    from 9121628  Config.
     new 68d2870  Config.
     new 926b542  Config.

The 2 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 | 17 +++++++----------
 config/generate-config     |  7 +++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
index c291c11..73918f1 100755
--- a/bin/taler-deployment-start
+++ b/bin/taler-deployment-start
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-base=$HOME
-
-export PATH="$base/deployment":$PATH
+export PATH="$HOME/deployment":$PATH
 
 # might fail if invoked from another script with ulimit
 ulimit -c $((100 * 1024)) &>/dev/null || true
@@ -11,10 +9,6 @@ cd $HOME
 
 taler-deployment-arm -s
 
-if [ "${TALER_CONFIG_STANDALONE:-0}" = 1 ]; then
-  taler-deployment-arm -i taler-postgres-standalone
-fi
-
 taler-deployment-arm -i taler-exchange
 taler-deployment-arm -i taler-auditor
 taler-deployment-arm -i taler-merchant
@@ -25,9 +19,12 @@ 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
-taler-deployment-arm -i taler-twister
-taler-deployment-arm -i taler-twister-exchange
-taler-deployment-arm -i taler-twister-bank
+
+if $(taler-config -s twister -o taler_deploy >& /dev/null); then
+  taler-deployment-arm -i taler-twister
+  taler-deployment-arm -i taler-twister-exchange
+  taler-deployment-arm -i taler-twister-bank
+fi
 
 if [[ "$TALER_ENV_NAME" = test ]]; then
   taler-deployment-arm -i taler-playground
diff --git a/config/generate-config b/config/generate-config
index 4970d21..02e4a6a 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -68,6 +68,12 @@ def config(obj):
 
     # Twisting the merchant backend responses.
     if obj.twisted:
+
+        ##
+        # Instructs ARM to lunch the Twisters, any value works.
+        # If missing, ARM will not launch Twisters.
+        obj.cfg_put("twister", "taler_deploy", "")
+
         obj.cfg_put("twister", "serve", "unix")
         obj.cfg_put("twister", "chaos_rate", "20")
         obj.cfg_put("twister", "destination_base_url", 
"https://backend.{}.taler.net".format(obj.envname))
@@ -285,6 +291,7 @@ def main(currency, envname, outdir, exchange_pub, twisted):
     config_files.append(mc)
 
     if "demo" != envname and twisted:
+
         # Twisting the exchange.
         twist_exchange_conf = ConfigFile(envname, currency, exchange_pub, 
"twister-exchange.conf")
         twist_exchange_conf.cfg_put("twister", "serve", "unix")

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