[GNUnet-SVN] [taler-deployment] 02/02: Config.

[gnunet]

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

marcello pushed a commit to branch master
in repository deployment.

commit 926b54290097d8607476ec73405519abebd5efea
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jun 28 20:20:57 2019 +0200

    Config.
    
    Instruct the ARM to launch the Twisters conditionally.
---
 bin/taler-deployment-start | 17 +++++++----------
 config/generate-config     |  5 +++--
 2 files changed, 10 insertions(+), 12 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 ffd6a37..02e4a6a 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -70,8 +70,9 @@ def config(obj):
     if obj.twisted:
 
         ##
-        # Instructs ARM to lunch the Twisters.
-        obj.cfg_put("twister", "taler_deployed", "YES")
+        # 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")

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