From 58f88abfa73eaef8cbbab7a445b33207976172d8 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 8 Jun 2018 14:22:58 +0200 Subject: fix payurl generation for standalone setups --- config/generate-config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/generate-config b/config/generate-config index 67e2011..aad15d3 100755 --- a/config/generate-config +++ b/config/generate-config @@ -60,7 +60,7 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("bank", "database", "postgres:///taler{}".format(envname)) if standalone: - cfg_put("bank", "suggested_exchange", "https://env.taler.net/{}/exchange/".format(os.getenv("HOME"))) + cfg_put("bank", "suggested_exchange", "https://env.taler.net/{}/exchange/".format(envname)) else: cfg_put("bank", "suggested_exchange", "https://exchange.{}.taler.net/".format(envname)) @@ -119,14 +119,14 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("frontends", "backend_apikey", "sandbox".format(envname)) if standalone: - cfg_put("frontends", "backend", "https://env.taler.net/{}/merchant-backend/".format(os.getenv("USER"))) + cfg_put("frontends", "backend", "https://env.taler.net/{}/merchant-backend/".format(envname)) else: cfg_put("frontends", "backend", "https://backend.{}.taler.net/".format(envname)) cfg_put("exchange-{}".format(currency), "master_key", exchange_pub) cfg_put("exchange-{}".format(currency), "currency", currency) if standalone: - cfg_put("exchange-{}".format(currency), "base_url", "https://env.taler.net/{}/exchange".format(os.getenv("USER"))) + cfg_put("exchange-{}".format(currency), "base_url", "https://env.taler.net/{}/exchange".format(envname)) else: cfg_put("exchange-{}".format(currency), "base_url", "https://exchange.{}.taler.net/".format(envname)) @@ -223,7 +223,7 @@ def config(currency, envname, exchange_pub, standalone): cfg_put("instance-Tutorial", "name", "Tutorial") if standalone: - cfg_put("account-merchant", "url", "payto://x-taler-bank/env.taler.net/{}/bank/{}".format(os.getenv("HOME"), "3")) + cfg_put("account-merchant", "url", "payto://x-taler-bank/env.taler.net/{}/bank/{}".format(envname, "3")) else: cfg_put("account-merchant", "url", "payto://x-taler-bank/bank.{}.taler.net/{}".format(envname, "3")) -- cgit v1.2.3