taler-deployment

commit eb7ff16042a40d7f57799c22d73f341a263cf8e3
parent 5c69f6365241870306d5b5bd0c8a4c0d2d2addd7
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sat, 19 Nov 2016 17:31:07 +0100

towards auto-generated config

Diffstat:
M
bin/taler-deployment-start
 | 
6
++++++
M
bootstrap-bluegreen
 | 
16
++++++++--------

2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
@@ -8,6 +8,12 @@ ulimit -c $((100 * 1024))
 
 cd $HOME
 
+if [[ ! -e ~/.config/taler.conf ]]; then
+  taler-deployment-config-generate
+fi
+
+taler-deployment-config-sign
+
 taler-deployment-arm -s
 taler-deployment-arm -i taler-exchange
 taler-deployment-arm -i taler-merchant
diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen
@@ -19,7 +19,7 @@
 set -eu
 
 usage() {
-  echo "Usage: $0 DEPLOYMENT_BASENAME"
+  echo "Usage: $0 ENVNAME"
 }
 
 if [ -z ${1+x} ]; then
@@ -27,12 +27,14 @@ if [ -z ${1+x} ]; then
   exit 1
 fi
 
-DEPLOYMENT_BASENAME=$1
+ENVNAME=$1
 
 BRANCH=master
-case $DEPLOYMENT_BASENAME in
+CURRENCY=PUDOS
+case $ENVNAME in
   demo)
     BRANCH=stable
+    CURRENCY=KUDOS
     ;;
 esac
 
@@ -59,10 +61,8 @@ cat >$HOME/activate <<EOL
 #!/bin/bash
 export PATH="$HOME/local/bin:$HOME/deployment/bin:\$PATH"
 export TALER_CHECKDB="postgres:///talercheck-$USER"
+export TALER_CONFIG_CURRENCY=$CURRENCY
+export TALER_CONFIG_ENV=$ENVNAME
 EOL
 
-mkdir -p $HOME/.config
-ln -sft $HOME/.config "$HOME/deployment/config/$DEPLOYMENT_BASENAME.taler.net/taler.conf"
-ln -sft $HOME/.config "$HOME/deployment/config/$DEPLOYMENT_BASENAME.taler.net/taler"
-
-ln -sf "/home/$DEPLOYMENT_BASENAME/shared-data" "$HOME"
+ln -sf "/home/$ENVNAME/shared-data" "$HOME"