[taler-deployment] branch master updated: import generated keys into auditor during preparation; do not run taler-auditor-sign twice

[gnunet]

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

grothoff pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new fc2d932  import generated keys into auditor during preparation; do not 
run taler-auditor-sign twice
fc2d932 is described below

commit fc2d9328626991a3fa03f0d52b00e7fb7b77663f
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Feb 23 20:03:10 2020 +0100

    import generated keys into auditor during preparation; do not run 
taler-auditor-sign twice
---
 bin/taler-deployment-prepare     | 22 +++++++++-------------
 buildbot/make_auditor_reports.sh |  6 ------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare
index c7de668..bfb71ba 100755
--- a/bin/taler-deployment-prepare
+++ b/bin/taler-deployment-prepare
@@ -46,23 +46,19 @@ case $TALER_ENV_NAME in
     ;;
 esac
 
-taler-exchange-keyup
-
 ##
 ## Step 2: Copy key material and update denom keys
 ##
 
+taler-auditor-exchange \
+  -c ${CONFIG_FILE} \
+  -m $(taler-config -c ${CONFIG_FILE} -s exchange -o master_public_key) \
+  -u $(taler-config -c ${CONFIG_FILE} -s exchange -o base_url) || true
 
-case $TALER_ENV_NAME in
-  demo|test|int)
-    ;;
-  *)
-    echo "Not copying private keys for env $TALER_ENV_NAME"
-    ;;
-esac
-
-taler-exchange-keyup
-
+rm -f auditor.in
+taler-exchange-keyup -o auditor.in
+taler-auditor-sign -r auditor.in -o auditor.out
+rm -f auditor.in auditor.out # we don't actually use the auditor's signatures 
in the demo!
 
 ##
 ## Step 3: Sign the exchange's wire information
@@ -75,7 +71,7 @@ chmod 770 $WIRE_RESPONSE
 
 
 ##
-## Step 4: 
+## Step 4:
 ##
 
 case $TALER_ENV_NAME in
diff --git a/buildbot/make_auditor_reports.sh b/buildbot/make_auditor_reports.sh
index 1ab964f..0bb01e3 100755
--- a/buildbot/make_auditor_reports.sh
+++ b/buildbot/make_auditor_reports.sh
@@ -40,12 +40,6 @@ fi
 
 CONFIG_FILE=${TALER_HOME}/.config/taler.conf
 
-echo "Adding exchange to auditor's list"
-taler-auditor-exchange \
-  -c ${CONFIG_FILE} \
-  -m $(taler-config -c ${CONFIG_FILE} -s exchange -o master_public_key) \
-  -u $(taler-config -c ${CONFIG_FILE} -s exchange -o base_url) || true
-
 # Generate first report.
 echo "Running taler-auditor"
 if ! taler-auditor -c ${CONFIG_FILE} > "${REPORT_FILE_NOEXT}.txt"; then

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