From ea789d2df4c4b63bed298b97f9274786650b264e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 14 Mar 2017 17:04:53 +0100 Subject: environment URLs --- bootstrap-bluegreen | 18 +++++++++++++++++- bootstrap-standalone | 11 ++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index eb83874..de765b7 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -19,7 +19,7 @@ set -eu usage() { - echo "Usage: $0 ENVNAME" + echo "Usage: $0 ENVNAME ENVCOLOR" } if [ -z ${1+x} ]; then @@ -27,7 +27,13 @@ if [ -z ${1+x} ]; then exit 1 fi +if [ -z ${2+x} ]; then + usage + exit 1 +fi + ENVNAME=$1 +ENVCOLOR=$2 BRANCH=master CURRENCY=PUDOS @@ -76,7 +82,17 @@ function taler-exchange-keyup () { export PATH="$HOME/deployment/bin:$HOME/local/bin:\$PATH" export TALER_CHECKDB="postgres:///talercheck-$USER" export TALER_CONFIG_CURRENCY=$CURRENCY + +# DEPRECATED ALIAS! export TALER_CONFIG_ENV=$ENVNAME + +export TALER_ENV_NAME=$ENVNAME +export TALER_ENV_COLOR=$ENVCOLOR +export TALER_ENV_URL_INTRO="https://$ENVNAME.taler.net/" +export TALER_ENV_URL_BANK="https://bank.$ENVNAME.taler.net/" +export TALER_ENV_URL_MERCHANT_BLOG="https://shop.$ENVNAME.taler.net/" +export TALER_ENV_URL_MERCHANT_DONATIONS="https://donations.$ENVNAME.taler.net/$env/" +export TALER_ENV_URL_AUDITOR="https://auditor.$ENVNAME.taler.net/" EOL ln -sf "/home/$ENVNAME/shared-data" "$HOME" diff --git a/bootstrap-standalone b/bootstrap-standalone index 11ba585..8754c43 100755 --- a/bootstrap-standalone +++ b/bootstrap-standalone @@ -60,8 +60,17 @@ function taler-exchange-keyup () { export PATH="$HOME/deployment/bin:$HOME/local/bin:\$PATH" export TALER_CHECKDB="postgresql:///talercheck?host=$HOME/sockets" export TALER_CONFIG_CURRENCY=$CURRENCY -export TALER_CONFIG_ENV=$ENVNAME export TALER_CONFIG_STANDALONE=1 + +# DEPRECATED ALIAS! +export TALER_CONFIG_ENV=$ENVNAME + +export TALER_ENV_NAME=$ENVNAME export TALER_CONFIG_DB="postgresql:///taler?host=$HOME/sockets" +export TALER_ENV_URL_INTRO="https://env.taler.net/$ENVNAME/" +export TALER_ENV_URL_BANK="https://env.taler.net/$ENVNAME/bank" +export TALER_ENV_URL_MERCHANT_BLOG="https://env.taler.net/$ENVNAME/shop" +export TALER_ENV_URL_MERCHANT_DONATIONS="https://env.taler.net/$ENVNAME/donations" +export TALER_ENV_URL_AUDITOR="https://env.taler.net/$ENVNAME/auditor" export TALER_ACTIVATED=1 EOL -- cgit v1.2.3