docker-compose

deploy missing shops and start aggregator

9 files changed, 31 insertions, 36 deletions

diff --git a/docker/hybrid/backup.sh b/docker/hybrid/backup.sh
index 03d5119..ae0fe75 100755
--- a/docker/hybrid/backup.sh
+++ b/docker/hybrid/backup.sh
@@ -14,11 +14,16 @@ fi
 
 BACKUP_FILE="/tmp/$(date +%Y-%m-%d)-taler-backup.tar"
 
+if test -a $BACKUP_FILE; then 
+  echo "Backup file $BACKUP_FILE exists already, please move it and run the script again."
+  exit 3 
+fi
+
 docker run \
   -v /tmp:/tmp \
   -v hybrid_talerdata:/taler-data \
   -v hybrid_talerlogs:/taler-logs \
   -it debian:stable \
-  /bin/bash -c "tar --no-same-owner --no-same-permissions -c -f ${BACKUP_FILE} /taler-data /taler-logs && chown $(id --user):$(id --group) ${BACKUP_FILE}" > /dev/null
+  /bin/bash -c "tar --no-same-owner --no-same-permissions -c -f ${BACKUP_FILE} /taler-data /taler-logs && chown $(id --user):$(id --group) ${BACKUP_FILE}"
 
 echo Backup at: ${BACKUP_FILE}
diff --git a/docker/hybrid/config/deployment.conf b/docker/hybrid/config/deployment.conf
index e0151f3..b68fd06 100644
--- a/docker/hybrid/config/deployment.conf
+++ b/docker/hybrid/config/deployment.conf
@@ -11,6 +11,12 @@ blog-sandbox-username = blog-at-sandbox
 blog-sandbox-password = secret-at-sandbox
 gnunet-sandbox-username = gnunet-at-sandbox
 gnunet-sandbox-password = secret-at-sandbox
+taler-sandbox-username = taler-at-sandbox
+taler-sandbox-password = secret-at-sandbox
+tor-sandbox-username = tor-at-sandbox
+tor-sandbox-password = secret-at-sandbox
+survey-sandbox-username = survey-at-sandbox
+survey-sandbox-password = secret-at-sandbox
 # default merchant instance
 default-sandbox-username = default-at-sandbox
 default-sandbox-password = secret-at-sandbox
diff --git a/docker/hybrid/docker-compose.yml b/docker/hybrid/docker-compose.yml
index 1ec5567..806d2c1 100644
--- a/docker/hybrid/docker-compose.yml
+++ b/docker/hybrid/docker-compose.yml
@@ -46,6 +46,7 @@ services:
       - 5556:80
       - 5559:8080 # blog
       - 5560:8081 # donations
+      - 5561:8082 # survey
     volumes:
       - talerlogs:/logs
       - ${TALER_DEPLOYMENT_CONFIG:?Please export TALER_DEPLOYMENT_CONFIG}:/config/deployment.conf
diff --git a/docker/hybrid/images/exchange/startup.sh b/docker/hybrid/images/exchange/startup.sh
index 28596df..a0bc725 100644
--- a/docker/hybrid/images/exchange/startup.sh
+++ b/docker/hybrid/images/exchange/startup.sh
@@ -68,7 +68,10 @@ echo Launching transfer service...
 taler-exchange-transfer -L DEBUG -c /config/taler.conf 2>&1 | \
   rotatelogs -e /logs/taler-exchange-transfer-%Y-%m-%d 86400 &
 echo DONE
-
+echo Launching aggregator service...
+taler-exchange-aggregator -L DEBUG -c /config/taler.conf 2>&1 | \
+  rotatelogs -e /logs/taler-exchange-aggregator-%Y-%m-%d 86400 &
+echo DONE
 taler-exchange-offline -L DEBUG -c /config/taler.conf \
   download sign \
   enable-account "payto://iban/SANDBOXX/${EXCHANGE_IBAN}?receiver-name=Exchange+Company" \
diff --git a/docker/hybrid/images/exchange/taler.conf b/docker/hybrid/images/exchange/taler.conf
index b19f97e..1bd5124 100644
--- a/docker/hybrid/images/exchange/taler.conf
+++ b/docker/hybrid/images/exchange/taler.conf
@@ -1,5 +1,6 @@
 [taler]
 currency = __CURRENCY__
+currency_round_unit = __CURRENCY__:0.01
 
 [paths]
 taler_data_home = /data/exchange
diff --git a/docker/hybrid/images/libeufin/Dockerfile b/docker/hybrid/images/libeufin/Dockerfile
index 992c9a1..295887c 100644
--- a/docker/hybrid/images/libeufin/Dockerfile
+++ b/docker/hybrid/images/libeufin/Dockerfile
@@ -1,5 +1,6 @@
 FROM taler_local/taler_base
 
 COPY startup.sh /
+COPY create_bank_accounts.sh /
 RUN chmod +x /startup.sh
 ENTRYPOINT /startup.sh
diff --git a/docker/hybrid/images/libeufin/startup.sh b/docker/hybrid/images/libeufin/startup.sh
index 805d4ea..02048e8 100644
--- a/docker/hybrid/images/libeufin/startup.sh
+++ b/docker/hybrid/images/libeufin/startup.sh
@@ -40,11 +40,8 @@ is_serving() {
     fi
   echo $2 reachable.
 }
-# IBANs referenced in the merchant container as well.
-DEFAULT_IBAN=DE474361
 EXCHANGE_IBAN=DE159593
-BLOG_IBAN=DE940993
-GNUNET_IBAN=DE463312
+
 mkdir -p ${MAYBE_VOLUME_MOUNTPOINT}
 export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${MAYBE_VOLUME_MOUNTPOINT}/sandbox.sqlite3"
 export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret
@@ -62,27 +59,8 @@ libeufin-sandbox serve --no-localhost-only --port $SANDBOX_PORT 2>&1 | \
 echo DONE
 is_serving ${LIBEUFIN_SANDBOX_URL} Sandbox
 
-EXCHANGE_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-sandbox-username`
-EXCHANGE_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o exchange-sandbox-password`
-BLOG_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o blog-sandbox-username`
-BLOG_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o blog-sandbox-password`
-GNUNET_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o gnunet-sandbox-username`
-GNUNET_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o gnunet-sandbox-password`
-DEFAULT_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s taler-deployment -o default-sandbox-username`
-DEFAULT_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o default-sandbox-password`
+source create_bank_accounts.sh
 
-echo -n "create default merchant instance bank account..."
-register_sandbox_account $DEFAULT_SANDBOX_USERNAME $DEFAULT_SANDBOX_PASSWORD $DEFAULT_IBAN "default merchant instance"
-echo DONE
-echo -n "create exchange bank account..."
-register_sandbox_account $EXCHANGE_SANDBOX_USERNAME $EXCHANGE_SANDBOX_PASSWORD $EXCHANGE_IBAN "exchange company"
-echo DONE
-echo -n "create Blog bank account..."
-register_sandbox_account $BLOG_SANDBOX_USERNAME $BLOG_SANDBOX_PASSWORD $BLOG_IBAN BlogCompany
-echo DONE
-echo -n "create GNUnet bank account..."
-register_sandbox_account $GNUNET_SANDBOX_USERNAME $GNUNET_SANDBOX_PASSWORD $GNUNET_IBAN GNUnet
-echo DONE
 echo -n "Create exchange EBICS subscriber at Sandbox.."
 export LIBEUFIN_SANDBOX_USERNAME=admin
 export LIBEUFIN_SANDBOX_PASSWORD=secret
diff --git a/docker/hybrid/images/merchant/Dockerfile b/docker/hybrid/images/merchant/Dockerfile
index 4f744a5..4121177 100644
--- a/docker/hybrid/images/merchant/Dockerfile
+++ b/docker/hybrid/images/merchant/Dockerfile
@@ -2,5 +2,6 @@ FROM taler_local/taler_base
 
 COPY taler.conf /config/taler.conf
 COPY startup.sh /
+COPY create_instances.sh /
 RUN chmod +x /startup.sh
 ENTRYPOINT /startup.sh
diff --git a/docker/hybrid/images/merchant/startup.sh b/docker/hybrid/images/merchant/startup.sh
index b6b2ca8..75fd3de 100644
--- a/docker/hybrid/images/merchant/startup.sh
+++ b/docker/hybrid/images/merchant/startup.sh
@@ -8,9 +8,13 @@ CURRENCY=`taler-config -c /config/deployment.conf -s taler-deployment -o currenc
 BACKEND_APIKEY=`taler-config -c /config/deployment.conf -s taler-deployment -o merchant-apikey`
 EXCHANGE_URL="http://exchange/"
 DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o db-password`
+
 BLOG_IBAN=DE940993
 GNUNET_IBAN=DE463312
 DEFAULT_IBAN=DE474361
+TOR_IBAN=DE358263
+TALER_IBAN=DE102893
+SURVEY_IBAN=DE731371
 
 while ! pg_isready -h talerdb -d taler; do
   echo DB not ready yet.
@@ -68,15 +72,8 @@ taler-merchant-httpd -c /config/taler.conf 2>&1 | \
   rotatelogs -e /logs/taler-merchant-httpd-%Y-%m-%d 86400 &
 echo DONE
 sleep 1
-echo -n "Create default instance..."
-curl -s -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://iban/SANDBOXX/'$DEFAULT_IBAN'?receiver-name=Merchant43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"'${CURRENCY}':1", "default_max_deposit_fee":"'${CURRENCY}':1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 1},"default_pay_delay":{"d_us": 3600000000}}' http://merchant/management/instances
-echo DONE
-echo -n "Create blog instance..."
-curl -s -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://iban/SANDBOXX/'$BLOG_IBAN'?receiver-name=BlogCompany"],"id":"blog","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"'${CURRENCY}':1", "default_max_deposit_fee":"'${CURRENCY}':1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 1000000},"default_pay_delay":{"d_us": 3600000000}}' http://merchant/management/instances
-echo DONE
-echo -n "Create donations instance..."
-curl -s -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://iban/SANDBOXX/'$GNUNET_IBAN'?receiver-name=GNUnet"],"id":"GNUnet","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"'${CURRENCY}':1", "default_max_deposit_fee":"'${CURRENCY}':1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 1000000},"default_pay_delay":{"d_us": 3600000000}}' http://merchant/management/instances
-echo DONE
+
+source /create_instances.sh
 
 echo -n "Launch blog..."
 ${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8080 blog &
@@ -84,5 +81,7 @@ echo DONE
 echo -n "Launch donations..."
 ${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8081 donations &
 echo DONE
-
+echo -n "Launch Survey..."
+${HOME}/.local/bin/taler-merchant-demos -c /config/taler.conf --http-port 8082 survey &
+echo DONE
 wait