[taler-deployment] branch master updated: tos

[gnunet]

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

dold pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new a036110  tos
a036110 is described below

commit a036110efa14670da9b24789dfc2d6f7d1cf206f
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Sep 28 10:27:36 2023 +0200

    tos
---
 sandcastle/docker-compose.yml                 |  9 ---------
 sandcastle/images/exchange/scripts/startup.sh | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sandcastle/docker-compose.yml b/sandcastle/docker-compose.yml
index 7049d55..b055b8a 100644
--- a/sandcastle/docker-compose.yml
+++ b/sandcastle/docker-compose.yml
@@ -32,15 +32,6 @@ services:
   exchange:
     build: ./images/exchange
     image: sandcastle_exchange
-    environment:
-      - TOS_AUTHOR="Taler Systems SA"
-      - TOS_COPYRIGHT="Taler Systems SA"
-      - TOS_PATH=/usr/local/share/taler/terms
-      - TOS_INPUT=exchange-tos-v0
-      - TOS_LANGUAGE=en
-      - TOS_OUTPUT=/usr/local/share/taler/terms/
-      - TOS_PAPER=a4
-      - TOS_TITLE="GNU Taler terms of service"
     depends_on:
       - talerdb
     ports:
diff --git a/sandcastle/images/exchange/scripts/startup.sh 
b/sandcastle/images/exchange/scripts/startup.sh
index 109d6e2..be70afc 100644
--- a/sandcastle/images/exchange/scripts/startup.sh
+++ b/sandcastle/images/exchange/scripts/startup.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
+
+#
 # Generate Taler ToS (Terms of Service)
+#
+
+
+# ToS generator is picky about the path that it is being run from
 cd $TOS_PATH
-taler-terms-generator -i $TOS_INPUT -a $TOS_AUTHOR -C $TOS_COPYRIGHT -p 
$TOS_PAPER -o $TOS_OUTPUT
+TOS_AUTHOR="Taler Systems SA"
+TOS_COPYRIGHT="Taler Systems SA"
+TOS_PATH=/usr/local/share/taler/terms
+TOS_LANGUAGE=en
+TOS_OUTPUT=/usr/local/share/taler/terms/
+TOS_PAPER=a4
+TOS_TITLE="GNU Taler terms of service"
+
+taler-terms-generator -i exchange-tos-v0 -a $TOS_AUTHOR -C $TOS_COPYRIGHT -p 
$TOS_PAPER -o $TOS_OUTPUT
+taler-terms-generator -i exchange-pp-v0 -a $TOS_AUTHOR -C $TOS_COPYRIGHT -p 
$TOS_PAPER -o $TOS_OUTPUT
+
+cd /
 
 source /scripts/config.sh
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.