taler-deployment

commit 582e707491fb650697ecb90b94faf51ec823956e
parent dfdbc39c9d7f6bcbb5bb496066d597d99eafa640
Author: Florian Dold <florian.dold@gmail.com>
Date:   Tue, 10 Jan 2017 17:09:31 +0100

bank uri

Diffstat:
M
config/generate-config
 | 
25
+++++++++++++++++--------

1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/config/generate-config b/config/generate-config
@@ -146,10 +146,14 @@ def config(currency, envname, exchange_pub, standalone):
     coin(currency, "1000", "1000")
 
 
-def merchant_wf(envname, instance_name, acct_no):
+def merchant_wf(envname, instance_name, acct_no, standalone):
+    if standalone:
+        bank_uri = "https://env.taler.net/{}/bank/".format(envname)
+    else:
+        bank_uri = "https://bank.{}.taler.net/".format(envname)
     data = OrderedDict(
         type="test",
-        bank_uri="https://bank.{}.taler.net/".format(envname),
+        bank_uri="bank_uri",
         sig="MERCHANTSIGNATURE",
         account_number=acct_no,
         salt="SALT"
@@ -172,18 +176,23 @@ def exchange_wf(envname, wfname, acct_no, name):
 @click.option("--currency", default="KUDOS")
 @click.option("--envname", default="demo")
 @click.option("--outdir", default=None)
-@click.option("--standalone", default=None)
+@click.option("--standalone", default=None, help="Enable a standalone/env deployment instead of test/demo")
 @click.option("--exchange-pub", required=True)
 def main(currency, envname, outdir, exchange_pub, standalone):
 
+    if not standalone:
+        if envname not in ("demo", "test"):
+            print("envname {} not supported unless in standalone mode".format(envname))
+            return
+
     config(currency, envname, exchange_pub, standalone == "1")
 
     merchant_wireformats = [
-        merchant_wf(envname, "gnunet", 4),
-        merchant_wf(envname, "taler", 5),
-        merchant_wf(envname, "tor", 3),
-        merchant_wf(envname, "fsf", 6),
-        merchant_wf(envname, "tutorial", 7),
+        merchant_wf(envname, "gnunet", 4, standalone),
+        merchant_wf(envname, "taler", 5, standalone),
+        merchant_wf(envname, "tor", 3, standalone),
+        merchant_wf(envname, "fsf", 6, standalone),
+        merchant_wf(envname, "tutorial", 7, standalone),
     ]
 
     exchange_wireformats = [