[GNUnet-SVN] [taler-deployment] branch master updated: Make bootstrap script color-agnostic.

[gnunet]

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

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new c13456d  Make bootstrap script color-agnostic.
c13456d is described below

commit c13456dc14116b73a47dc923812b4bb42cbf765c
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jun 26 23:59:02 2019 +0200

    Make bootstrap script color-agnostic.
---
 bootstrap-standalone                   | 78 ----------------------------------
 bootstrap-bluegreen => bootstrap-taler |  7 +--
 2 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/bootstrap-standalone b/bootstrap-standalone
deleted file mode 100755
index 5e11dbb..0000000
--- a/bootstrap-standalone
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# Bootstrap the Taler setup for the user account that
-# is currently logged in.
-
-# Generates a setup for a single user,
-# including a postgresql DB.
-
-set -eu
-
-ENVNAME=$USER
-BRANCH=master
-CURRENCY=$(echo "KUDOS-$USER" | cut -c 1-11)
-PGBINDIR=$(pg_config --bindir)
-
-cd $HOME
-
-if ! test -d $HOME/gnunet; then
-  git clone git://git.gnunet.org/gnunet.git
-fi
-
-if ! test -d $HOME/libmicrohttpd; then
-  git clone git://git.gnunet.org/libmicrohttpd.git
-fi
-
-for component in twister bank merchant gnurl landing exchange donations blog 
deployment survey auditor backoffice ; do
-  if ! test -d $HOME/$component; then
-    git clone git://git.taler.net/$component.git
-  fi
-done
-
-for component in twister bank merchant landing exchange donations blog survey 
auditor backoffice ; do
-  echo "Checking out $component to $BRANCH"
-  git -C $HOME/$component checkout $BRANCH
-done
-
-if ! test -d $HOME/talerdb; then
-  $PGBINDIR/initdb -D talerdb -U $USER
-fi
-
-mkdir -p $HOME/sockets
-
-$PGBINDIR/postgres --single -D ~/talerdb  -k $HOME/sockets -h "" postgres \
-  >/dev/null <<< "create database taler"
-$PGBINDIR/postgres --single -D ~/talerdb  -k $HOME/sockets -h "" postgres \
-  >/dev/null <<< "create database talercheck"
-
-cat >$HOME/activate <<EOL
-#!/bin/bash
-
-function taler-config-generate () {
-  echo "Command disabled. Please use taler-deployment-config-generate instead."
-  return 1
-}
-function taler-exchange-keyup () {
-  echo "Command disabled. Please use taler-deployment-keyup instead."
-}
-
-export PATH="$HOME/deployment/bin:$HOME/local/bin:\$PATH"
-export PYTHONPATH="$HOME/local/lib/python3.5/site-packages"
-export TALER_CHECKDB="postgres:///talercheck?host=$HOME/sockets"
-export TALER_CONFIG_CURRENCY=$CURRENCY
-export TALER_CONFIG_STANDALONE=1
-
-# DEPRECATED ALIAS!
-export TALER_CONFIG_ENV=$ENVNAME
-
-export TALER_ENV_NAME=$ENVNAME
-export TALER_CONFIG_DB="postgres:///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_MERCHANT_SURVEY="https://env.taler.net/$ENVNAME/survey";
-export TALER_ENV_URL_AUDITOR="https://env.taler.net/$ENVNAME/auditor";
-export TALER_ENV_URL_BACKOFFICE="https://env.taler.net/$ENVNAME/backoffice";
-export TALER_ACTIVATED=1
-EOL
diff --git a/bootstrap-bluegreen b/bootstrap-taler
similarity index 95%
rename from bootstrap-bluegreen
rename to bootstrap-taler
index 20e6798..c4c4a5c 100755
--- a/bootstrap-bluegreen
+++ b/bootstrap-taler
@@ -19,7 +19,7 @@
 set -eu
 
 usage() {
-  echo "Usage: $0 ENVNAME ENVCOLOR"
+  echo "Usage: $0 ENVNAME"
 }
 
 if [ -z ${1+x} ]; then
@@ -33,7 +33,6 @@ if [ -z ${2+x} ]; then
 fi
 
 ENVNAME=$1
-ENVCOLOR=$2
 BRANCH=master
 CURRENCY=TESTKUDOS
 
@@ -93,7 +92,6 @@ export TALER_CONFIG_CURRENCY=$CURRENCY
 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/";
@@ -103,10 +101,9 @@ export 
TALER_ENV_URL_AUDITOR="https://auditor.$ENVNAME.taler.net/";
 export TALER_ENV_URL_BACKOFFICE="https://backoffice.$ENVNAME.taler.net/";
 EOL
 
-ln -sf "/home/$ENVNAME/shared-data" "$HOME"
-
 mkdir -p "$HOME/sockets"
 mkdir -p "$HOME/stamps"
+mkdir -p "$HOME/taler-data"
 
 ln -sf ../deployment/taler-build/Makefile stamps/
 ln -sf ../deployment/taler-build/invalidate.sh stamps/

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