Merge branch 'master' of taler.net:deployment

1 files changed, 14 insertions, 7 deletions

diff --git a/config/generate-config b/config/generate-config
index 9bc91ad..46ac920 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -57,6 +57,9 @@ def config(currency, envname, exchange_pub, standalone):
     else:
         cfg_put("bank", "database", "postgres:///taler{}".format(envname))
 
+    if standalone:
+        cfg_put("bank", "suggested_exchange", "https://env.taler.net/{}/exchange/".format(envname))
+
     cfg_put("bank-admin", "uwsgi_serve", "unix")
     cfg_put("bank-admin", "uwsgi_unixpath", "$HOME/sockets/bank-admin.uwsgi")
     cfg_put("bank-admin", "uwsgi_unixpath_mode", "660")
@@ -103,7 +106,10 @@ def config(currency, envname, exchange_pub, standalone):
     else:
         cfg_put("exchangedb-postgres", "db_conn_str", "postgres:///taler{}".format(envname))
 
-    cfg_put("exchange-wire-outgoing-test", "bank_uri", "https://bank.{}.taler.net/".format(envname))
+    if standalone:
+        cfg_put("exchange-wire-outgoing-test", "bank_uri", "https://env.taler.net/{}/bank/".format(envname))
+    else:
+        cfg_put("exchange-wire-outgoing-test", "bank_uri", "https://bank.{}.taler.net/".format(envname))
     cfg_put("exchange-wire-outgoing-test", "bank_account_number", "1")
     cfg_put("exchange-wire-outgoing-test", "exchange_account_number", "2")
 
@@ -142,11 +148,11 @@ def config(currency, envname, exchange_pub, standalone):
 
 def merchant_wf(envname, instance_name, acct_no):
     data = OrderedDict(
-      type="test",
-      bank_uri="https://bank.{}.taler.net/".format(envname),
-      sig="MERCHANTSIGNATURE",
-      account_number=acct_no,
-      salt="SALT"
+        type="test",
+        bank_uri="https://bank.{}.taler.net/".format(envname),
+        sig="MERCHANTSIGNATURE",
+        account_number=acct_no,
+        salt="SALT"
     )
 
     return (instance_name, json.dumps(data, indent=2))
@@ -156,7 +162,8 @@ def exchange_wf(envname, wfname, acct_no, name):
         name=name,
         type=wfname,
         bank_uri="https://bank.{}.taler.net/".format(envname),
-        account_number=acct_no)
+        account_number=acct_no
+    )
     return (wfname, json.dumps(data, indent=2))