fix string formatting

1 files changed, 15 insertions, 19 deletions

diff --git a/config/generate-config b/config/generate-config
index 09dc1fa..9854a3d 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -67,10 +67,10 @@ def config(obj):
     obj.cfg_put("taler", "CURRENCY", obj.currency)
 
     # Twisting the merchant backend responses.
-    if "test" == obj.envname and obj.twisted:
+    if obj.twisted:
         obj.cfg_put("twister", "serve", "unix")
         obj.cfg_put("twister", "chaos_rate", "20")
-        obj.cfg_put("twister", "destination_base_url", "https://backend.test.taler.net")
+        obj.cfg_put("twister", "destination_base_url", "https://backend.{}.taler.net".format(obj.envname))
         obj.cfg_put("twister", "serve_unixpath", "$HOME/sockets/twister.http")
         obj.cfg_put("twister", "serve_unixmode", "660")
         obj.cfg_put("twister", "unixpath", "$HOME/sockets/twister-control.sock")
@@ -128,22 +128,18 @@ def config(obj):
 
     obj.cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(obj.envname))
 
-    if obj.twisted:
+    if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("merchant-exchange-test", "url", "https://twister-exchange.wild.gv.taler.net/")
     else:
-        obj.cfg_put("merchant-exchange-test", "url", "https://exchange.test.taler.net/")
+        obj.cfg_put("merchant-exchange-test", "url", "https://exchange.{}.taler.net/".format(obj.envname))
 
     obj.cfg_put("merchant-exchange-test", "master_key", obj.exchange_pub)
 
     obj.cfg_put("frontends", "backend_apikey", "sandbox".format(obj.envname))
 
-    if "test" == obj.envname:
-        if obj.twisted:
-            obj.cfg_put("frontends", "backend", "https://twister-backend.wild.gv.taler.net/")
-        else:
-            obj.cfg_put("frontends", "backend", "https://backend.test.taler.net/")
+    if "demo" != obj.envname and obj.twisted:
+        obj.cfg_put("frontends", "backend", "https://twister-backend.wild.gv.taler.net/")
     else:
-        assert ("demo" == obj.envname)
         obj.cfg_put("frontends", "backend", "https://backend.{}.taler.net/".format(obj.envname))
 
     obj.cfg_put("exchange-{}".format(obj.currency), "master_key", obj.exchange_pub)
@@ -173,10 +169,10 @@ def config(obj):
     obj.cfg_put("auditordb-postgres", "db_conn_str", "postgres:///taler{}".format(obj.envname))
     obj.cfg_put("auditordb-postgres", "config", "postgres:///taler{}".format(obj.envname))
 
-    if obj.twisted:
+    if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("account-1", "url", "payto://x-taler-bank/twister-bank.wild.gv.taler.net/2")
     else:
-        obj.cfg_put("account-1", "url", "payto://x-taler-bank/bank.test.taler.net/2")
+        obj.cfg_put("account-1", "url", "payto://x-taler-bank/bank.{}.taler.net/2".format(obj.envname))
 
     obj.cfg_put("account-1", "wire_response", "${TALER_DEPLOYMENT_DATA}/exchange/wire/test.json")
     obj.cfg_put("account-1", "plugin", "taler_bank")
@@ -241,10 +237,10 @@ def config(obj):
     obj.cfg_put("instance-Tutorial", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/tutorial.priv")
     obj.cfg_put("instance-Tutorial", "name", "Tutorial")
 
-    if obj.twisted:
+    if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("account-merchant", "url", "payto://x-taler-bank/twister-bank.taler.net/3")
     else:
-        obj.cfg_put("account-merchant", "url", "payto://x-taler-bank/bank.test.taler.net/3")
+        obj.cfg_put("account-merchant", "url", "payto://x-taler-bank/bank.{}.taler.net/3".format(obj.envname))
 
     obj.cfg_put("account-merchant", "plugin", "taler_bank")
     obj.cfg_put("account-merchant", "taler_bank_auth_method", "basic")
@@ -277,8 +273,8 @@ def config(obj):
 @click.option("--twisted", is_flag=True)
 def main(currency, envname, outdir, exchange_pub, twisted):
 
-    if envname not in ("demo", "test"):
-        print("envname (%s) not demo/test, aborting config generation" % envname)
+    if envname not in ("demo", "test", "int"):
+        print("envname (%s) not demo/test/int, aborting config generation" % envname)
         return
 
     config_files = []
@@ -287,12 +283,12 @@ def main(currency, envname, outdir, exchange_pub, twisted):
     config(mc)
     config_files.append(mc)
 
-    if "test" == envname and twisted:
+    if "demo" != envname and twisted:
         # Twisting the exchange.
         twist_exchange_conf = ConfigFile(envname, currency, exchange_pub, "twister-exchange.conf")
         twist_exchange_conf.cfg_put("twister", "serve", "unix")
         twist_exchange_conf.cfg_put("twister", "chaos_rate", "20")
-        twist_exchange_conf.cfg_put("twister", "destination_base_url", "https://exchange.test.taler.net")
+        twist_exchange_conf.cfg_put("twister", "destination_base_url", "https://exchange.{}.taler.net" % envname)
         twist_exchange_conf.cfg_put("twister", "serve_unixpath", "$HOME/sockets/twister-exchange.http")
         twist_exchange_conf.cfg_put("twister", "serve_unixmode", "660")
         twist_exchange_conf.cfg_put("twister", "unixpath", "$HOME/sockets/twister-exchange-control.sock")
@@ -304,7 +300,7 @@ def main(currency, envname, outdir, exchange_pub, twisted):
         twist_bank_conf = ConfigFile(envname, currency, exchange_pub, "twister-bank.conf")
         twist_bank_conf.cfg_put("twister", "serve", "unix")
         twist_bank_conf.cfg_put("twister", "chaos_rate", "20")
-        twist_bank_conf.cfg_put("twister", "destination_base_url", "https://bank.test.taler.net")
+        twist_bank_conf.cfg_put("twister", "destination_base_url", "https://bank.{}.taler.net" % envname)
         twist_bank_conf.cfg_put("twister", "serve_unixpath", "$HOME/sockets/twister-bank.http")
         twist_bank_conf.cfg_put("twister", "serve_unixmode", "660")
         twist_bank_conf.cfg_put("twister", "unixpath", "$HOME/sockets/twister-bank-control.sock")