configuration of local deployment

2 files changed, 19 insertions, 15 deletions

diff --git a/bin/taler-config-generate b/bin/taler-config-generate
index 03ba084..435fa51 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-config-generate
@@ -6,6 +6,7 @@ import json
 import os
 import urllib.parse
 import stat
+from taler_urls import get_urls
 
 class ConfigFile:
     def __init__(self, envname, currency, exchange_pub, twisted, filename):
@@ -61,6 +62,7 @@ def coin(obj,
     obj.cfg_put(sec, "rsa_keysize", rsa_keysize)
 
 def config(obj):
+    urls = get_urls(obj.envname)
     obj.cfg_put("paths", "TALER_DEPLOYMENT_DATA", "${HOME}/taler-data")
     obj.cfg_put("paths", "TALER_DATA_HOME", "${HOME}/taler-data")
     obj.cfg_put("taler", "CURRENCY", obj.currency)
@@ -76,7 +78,7 @@ def config(obj):
 
         obj.cfg_put("twister", "serve", "unix")
         obj.cfg_put("twister", "chaos_rate", "20")
-        obj.cfg_put("twister", "destination_base_url", "https://backend.{}.taler.net".format(obj.envname))
+        obj.cfg_put("twister", "destination_base_url", urls["merchant_backend"])
         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")
@@ -93,7 +95,7 @@ def config(obj):
     obj.cfg_put("bank", "allow_registrations", "YES")
     obj.cfg_put("bank", "base_url", "https://bank.{}.taler.net/".format(obj.envname))
     obj.cfg_put("bank", "database", "postgres:///taler{}".format(obj.envname))
-    obj.cfg_put("bank", "suggested_exchange", "https://exchange.{}.taler.net/".format(obj.envname))
+    obj.cfg_put("bank", "suggested_exchange", urls["exchange"])
 
     obj.cfg_put("bank-admin", "uwsgi_serve", "unix")
     obj.cfg_put("bank-admin", "uwsgi_unixpath", "$HOME/sockets/bank-admin.uwsgi")
@@ -112,7 +114,7 @@ def config(obj):
     obj.cfg_put("survey", "uwsgi_unixpath_mode", "660")
     obj.cfg_put("survey", "bank_password", "x")
 
-    obj.cfg_put("backoffice-all", "backend", "https://backend.{}.taler.net/".format(obj.envname))
+    obj.cfg_put("backoffice-all", "backend", urls["merchant_backend"])
 
     # Keep only one back-office service for all instances, for simplicity.
     obj.cfg_put("backoffice-all", "uwsgi_serve", "unix")
@@ -128,12 +130,12 @@ def config(obj):
 
     obj.cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(obj.envname))
 
-    obj.cfg_put("frontends", "backend_apikey", "sandbox".format(obj.envname))
+    obj.cfg_put("frontends", "backend_apikey", "sandbox")
 
     if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("frontends", "backend", "https://twister-backend.wild.gv.taler.net/")
     else:
-        obj.cfg_put("frontends", "backend", "https://backend.{}.taler.net/".format(obj.envname))
+        obj.cfg_put("frontends", "backend", urls["merchant_backend"])
 
     obj.cfg_put("merchant-exchange-{}".format(obj.currency), "master_key", obj.exchange_pub)
     obj.cfg_put("merchant-exchange-{}".format(obj.currency), "currency", obj.currency)
@@ -141,13 +143,13 @@ def config(obj):
     if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("merchant-exchange-{}".format(obj.currency), "exchange_base_url", "https://twister-exchange.wild.gv.taler.net/")
     else:
-        obj.cfg_put("merchant-exchange-{}".format(obj.currency), "exchange_base_url", "https://exchange.{}.taler.net/".format(obj.envname))
+        obj.cfg_put("merchant-exchange-{}".format(obj.currency), "exchange_base_url", urls["exchange"])
     obj.cfg_put("auditor", "serve", "unix")
-    obj.cfg_put("auditor", "auditor_url", "https://auditor.{}.taler.net/service/".format(obj.envname))
+    obj.cfg_put("auditor", "auditor_url", urls["auditor"])
     obj.cfg_put("auditor", "unixpath", "$HOME/sockets/auditor.http")
     obj.cfg_put("auditor", "tiny_amount", obj.currency + ":0.01")
 
-    obj.cfg_put("exchange", "base_url", "https://exchange.{}.taler.net/".format(obj.envname))
+    obj.cfg_put("exchange", "base_url", urls["exchange"])
     obj.cfg_put("exchange", "serve", "unix")
     obj.cfg_put("exchange", "unixpath", "$HOME/sockets/exchange.http")
     obj.cfg_put("exchange", "master_public_key", obj.exchange_pub)
@@ -162,9 +164,9 @@ def config(obj):
     if "demo" != obj.envname and obj.twisted:
         bank_acct_url = "https://twister-bank.wild.gv.taler.net/taler-wire-gateway/Exchange/"
     else:
-        bank_acct_url = f"https://bank.{obj.envname}.taler.net/taler-wire-gateway/Exchange/"
+        bank_acct_url = f"{}taler-wire-gateway/Exchange/".format(urls["bank"])
 
-    obj.cfg_put("exchange-account-1", "payto_uri", "payto://x-taler-bank/bank.{}.taler.net/Exchange".format(obj.envname))
+    obj.cfg_put("exchange-account-1", "payto_uri", "{}Exchange".format(urls["talerbank_payto"]))
     obj.cfg_put("exchange-account-1", "wire_response", "${TALER_DATA_HOME}/exchange/wire/test.json")
     obj.cfg_put("exchange-account-1", "wire_gateway_auth_method", "basic")
     obj.cfg_put("exchange-account-1", "wire_gateway_url", bank_acct_url)
@@ -210,7 +212,7 @@ def config(obj):
     if "demo" != obj.envname and obj.twisted:
         obj.cfg_put("merchant-account-merchant", "payto_uri", "payto://x-taler-bank/twister-bank.taler.net/Tutorial")
     else:
-        obj.cfg_put("merchant-account-merchant", "payto_uri", "payto://x-taler-bank/bank.{}.taler.net/Tutorial".format(obj.envname))
+        obj.cfg_put("merchant-account-merchant", "payto_uri", "{}Tutorial".format(urls["talerbank_payto"]))
 
     obj.cfg_put("merchant-account-merchant", "wire_response", "${TALER_DATA_HOME}/merchant/wire/merchant.json")
     obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770")
@@ -262,7 +264,7 @@ def main(currency, envname, outdir, exchange_pub, twisted):
         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.{}.taler.net" % envname)
+        twist_exchange_conf.cfg_put("twister", "destination_base_url", urls["exchange"])
         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")
@@ -274,7 +276,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.{}.taler.net" % envname)
+        twist_bank_conf.cfg_put("twister", "destination_base_url", urls["bank"])
         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")
diff --git a/bin/taler_urls.py b/bin/taler_urls.py
index 1ce8c0e..caf9a84 100644
--- a/bin/taler_urls.py
+++ b/bin/taler_urls.py
@@ -9,7 +9,8 @@ taler_urls = dict(
         landing = "https://{}.taler.net/",
         survey = "http://survey.{}.taler.net/",
         auditor = "http://auditor.{}.taler.net/",
-        sync = "http://sync.{}.taler.net/"
+        sync = "http://sync.{}.taler.net/",
+        talerbank_payto = "payto://x-taler-bank/bank.{}.taler.net/"
     ),
     offline = dict(
         donations = "http://localhost:5880/",
@@ -21,7 +22,8 @@ taler_urls = dict(
         landing = "http://localhost:5886/",
         survey = "http://localhost:5887/",
         auditor = "http://localhost:5888/",
-        sync = "http://localhost:5889/"
+        sync = "http://localhost:5889/",
+        talerbank_payto = "payto://x-taler-bank/localhost:5882/"
     )
 )