sandcastle: restructure exchange scripts

3 files changed, 40 insertions, 34 deletions

diff --git a/sandcastle/images/exchange/Dockerfile b/sandcastle/images/exchange/Dockerfile
index 992c9a1..276d4be 100644
--- a/sandcastle/images/exchange/Dockerfile
+++ b/sandcastle/images/exchange/Dockerfile
@@ -1,5 +1,6 @@
 FROM taler_local/taler_base
 
-COPY startup.sh /
-RUN chmod +x /startup.sh
-ENTRYPOINT /startup.sh
+RUN mkdir -p /scripts
+COPY scripts/* /scripts
+RUN chmod +x /scripts/*.sh
+ENTRYPOINT /scripts/startup.sh
diff --git a/sandcastle/images/exchange/scripts/config.sh b/sandcastle/images/exchange/scripts/config.sh
new file mode 100644
index 0000000..b5bf4e3
--- /dev/null
+++ b/sandcastle/images/exchange/scripts/config.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -o pipefail
+set -eu
+
+export LD_LIBRARY_PATH=/usr/local/lib
+export GNUNET_FORCE_LOG=";;;;WARNING"
+
+mkdir -p /etc/taler
+TALERCONF=/etc/taler/taler.conf
+cp /config/exchange/taler.conf $TALERCONF
+
+# Values from config file mounted at run time:
+CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currency`
+EXCHANGE_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o default-exchange`
+
+EXCHANGE_NEXUS_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-username`
+EXCHANGE_NEXUS_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-password`
+EXCHANGE_IBAN=DE159593
+TALER_FACADE_NAME=taler-facade
+DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o db-password`
+sed -i "s;__EXCHANGE_URL__;${EXCHANGE_URL};" $TALERCONF
+sed -i "s;__DB_PASSWORD__;${DB_PASSWORD};" $TALERCONF
+sed -i "s/__CURRENCY__/${CURRENCY}/" $TALERCONF
+sed -i "s/__EXCHANGE_NEXUS_USERNAME__/${EXCHANGE_NEXUS_USERNAME}/" $TALERCONF
+sed -i "s/__EXCHANGE_NEXUS_PASSWORD__/${EXCHANGE_NEXUS_PASSWORD}/" $TALERCONF
+sed -i "s/__EXCHANGE_IBAN__/${EXCHANGE_IBAN}/" $TALERCONF
+sed -i "s/__TALER_FACADE_NAME__/${TALER_FACADE_NAME}/" $TALERCONF
+sed -i "s;__NEXUS_URL__;http://bank:15001;" $TALERCONF
+
+EXCHANGE_MASTER_PUB=$(taler-exchange-offline -c $TALERCONF setup)
+
+sed -i "s/__EXCHANGE_MASTER_PUB__/$EXCHANGE_MASTER_PUB/" $TALERCONF
diff --git a/sandcastle/images/exchange/startup.sh b/sandcastle/images/exchange/scripts/startup.sh
index aec8204..7454143 100644
--- a/sandcastle/images/exchange/startup.sh
+++ b/sandcastle/images/exchange/scripts/startup.sh
@@ -1,34 +1,6 @@
 #!/bin/bash
 
-set -o pipefail
-set -eu
-
-export LD_LIBRARY_PATH=/usr/local/lib
-export GNUNET_FORCE_LOG=";;;;WARNING"
-
-mkdir -p /etc/taler
-TALERCONF=/etc/taler/taler.conf
-cp /config/exchange/taler.conf $TALERCONF
-
-# Values from config file mounted at run time:
-CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currency`
-EXCHANGE_URL=`taler-config -c /config/deployment.conf -s taler-deployment -o default-exchange`
-
-socat TCP-LISTEN:5555,fork,reuseaddr TCP:localhost:80 &
-
-EXCHANGE_NEXUS_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-username`
-EXCHANGE_NEXUS_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-nexus-password`
-EXCHANGE_IBAN=DE159593
-TALER_FACADE_NAME=taler-facade
-DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o db-password`
-sed -i "s;__EXCHANGE_URL__;${EXCHANGE_URL};" $TALERCONF
-sed -i "s;__DB_PASSWORD__;${DB_PASSWORD};" $TALERCONF
-sed -i "s/__CURRENCY__/${CURRENCY}/" $TALERCONF
-sed -i "s/__EXCHANGE_NEXUS_USERNAME__/${EXCHANGE_NEXUS_USERNAME}/" $TALERCONF
-sed -i "s/__EXCHANGE_NEXUS_PASSWORD__/${EXCHANGE_NEXUS_PASSWORD}/" $TALERCONF
-sed -i "s/__EXCHANGE_IBAN__/${EXCHANGE_IBAN}/" $TALERCONF
-sed -i "s/__TALER_FACADE_NAME__/${TALER_FACADE_NAME}/" $TALERCONF
-sed -i "s;__NEXUS_URL__;http://bank:15001;" $TALERCONF
+source /scripts/config.sh
 
 while ! pg_isready -h talerdb -d taler; do
   echo DB not ready yet.
@@ -36,6 +8,8 @@ while ! pg_isready -h talerdb -d taler; do
 done
 echo Now DB is ready.
 
+socat TCP-LISTEN:5555,fork,reuseaddr TCP:localhost:80 &
+
 echo -n "Init database... "
 taler-exchange-dbinit -L WARNING -c $TALERCONF
 echo DONE
@@ -55,9 +29,7 @@ taler-exchange-secmod-cs -L WARNING \
   -c $TALERCONF 2>&1 | \
     rotatelogs -e /logs/taler-exchange-secmod-cs-%Y-%m-%d.log 86400 &
 echo DONE
-EXCHANGE_MASTER_PUB=$(taler-exchange-offline -c $TALERCONF setup)
 
-sed -i "s/__EXCHANGE_MASTER_PUB__/$EXCHANGE_MASTER_PUB/" $TALERCONF
 echo -n "Launching exchange HTTPD..."
 taler-exchange-httpd -L WARNING -c $TALERCONF 2>&1 | \
   rotatelogs -e /logs/taler-exchange-httpd-%Y-%m-%d.log 86400 &