taler-deployment

commit 11d307b4f90eea48ef93128db3e9c18bbd830a76
parent 4fbc4e6bdd35585e0cac94bedfdc0f0dcd1e2c99
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu,  7 Dec 2017 07:38:39 +0100

untested changes to deployment in the wake of #5188 -- please check

Diffstat:
M
bin/taler-deployment-top-reserve
 | 
9
++++++++-
M
config/generate-config
 | 
2
+-

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/bin/taler-deployment-top-reserve b/bin/taler-deployment-top-reserve
@@ -8,9 +8,16 @@ fi
 # %N is current nanoseconds.
 UUID=$(date +"uuid-%N")
 
+# Obtain reserve public key from file
+RESERVE=`gnunet-ecc -P ${TALER_DEPLOYMENT_SHARED}/merchant/default.priv`
+
+# Tell the exchange about the 'incoming' wire transfer
+# (TODO: shouldn't we rather tell the *bank* (bank/admin/add/incoming)
+#  to execute the wire transfer, and have the bank tell the exchange?
+#  This ought to cause the wire auditor to fail!)
 taler-exchange-reservemod \
   --add="$TALER_CONFIG_CURRENCY:100.0" \
-  --reserve=S98FEXHW3VJ93EA73CRAQ5E8E4DJE96Z9JXYFHFD169FWS9NS8A0 \
+  --reserve=$RESERVE \
   --sender='{"bank_uri":"https://bank.$TALER_ENV_NAME.taler.net/","account_number":7,"type":"test"}' \
   --transfer="{\"uuid\":\"$UUID\"}"
 
diff --git a/config/generate-config b/config/generate-config
@@ -175,7 +175,7 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("merchant-instance-GNUnet", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv")
     cfg_put("merchant-instance-Taler", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv")
     cfg_put("merchant-instance-default", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/default.priv")
-    cfg_put("merchant-instance-default", "tip_reserve_priv", "27CJT3ZDYSY1XWHNCYMF1HC1DXN5TP2HV2NQETFSNJJK9J9PWCP0")
+    cfg_put("merchant-instance-default", "tip_reserve_priv_filename", "${TALER_DEPLOYMENT_SHARED}/merchant/default-tip.priv")
     cfg_put("merchant-instance-default", "tip_exchange", "https://exchange.{}.taler.net/".format(envname))
     cfg_put("merchant-instance-tutorial", "keyfile", "${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.priv")