From 4772b13c7efaa9beba96c518eccce99c8f64845a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 24 Apr 2020 12:28:21 +0530 Subject: config generation --- bin/taler-config-generate | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'bin/taler-config-generate') diff --git a/bin/taler-config-generate b/bin/taler-config-generate index d83dc14..71fd635 100755 --- a/bin/taler-config-generate +++ b/bin/taler-config-generate @@ -122,7 +122,6 @@ def config(obj): obj.cfg_put("backoffice-all", "uwsgi_unixpath", "$HOME/sockets/backoffice.uwsgi") obj.cfg_put("backoffice-all", "instances", "FSF default Tor") - obj.cfg_put("merchant", "wireformat", "test") obj.cfg_put("merchant", "serve", "unix") obj.cfg_put("merchant", "unixpath", "$HOME/sockets/merchant.http") obj.cfg_put("merchant", "wire_transfer_delay", "0 s") @@ -131,13 +130,6 @@ def config(obj): obj.cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(obj.envname)) - 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.{}.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 "demo" != obj.envname and obj.twisted: @@ -147,7 +139,7 @@ def config(obj): obj.cfg_put("merchant-exchange-{}".format(obj.currency), "master_key", obj.exchange_pub) obj.cfg_put("merchant-exchange-{}".format(obj.currency), "currency", obj.currency) - obj.cfg_put("merchant-exchange-{}".format(obj.currency), "base_url", "https://exchange.{}.taler.net/".format(obj.envname)) + obj.cfg_put("merchant-exchange-{}".format(obj.currency), "exchange_base_url", "https://exchange.{}.taler.net/".format(obj.envname)) obj.cfg_put("auditor", "serve", "unix") obj.cfg_put("auditor", "auditor_url", "https://auditor.{}.taler.net/service/".format(obj.envname)) -- cgit v1.2.3 From f56e22d36f7dab3d4342650c712053fafc8459d1 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 24 Apr 2020 12:43:59 +0530 Subject: make honored instances active --- bin/taler-config-generate | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'bin/taler-config-generate') diff --git a/bin/taler-config-generate b/bin/taler-config-generate index 71fd635..218fbc4 100755 --- a/bin/taler-config-generate +++ b/bin/taler-config-generate @@ -235,12 +235,10 @@ def config(obj): 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") - obj.cfg_put("merchant-account-merchant", "HONOR_default", "YES") - obj.cfg_put("merchant-account-merchant", "HONOR_Tor", "YES") - obj.cfg_put("merchant-account-merchant", "HONOR_GNUnet", "YES") - obj.cfg_put("merchant-account-merchant", "HONOR_Taler", "YES") - obj.cfg_put("merchant-account-merchant", "HONOR_FSF", "YES") - obj.cfg_put("merchant-account-merchant", "HONOR_Tutorial", "YES") + merchant_instance_names = ("default", "Tor", "GNUnet", "Taler", "FSF", "Tutorial") + for mi in merchant_instance_names: + obj.cfg_put("merchant-account-merchant", f"HONOR_{mi}", "YES") + obj.cfg_put("merchant-account-merchant", f"ACTIVE_{mi}", "YES") coin(obj, "ct_10", "0.10") coin(obj, "1", "1") -- cgit v1.2.3