taler-deployment

commit f0815b1db3dcda3f3462476c03dc4bcd26401193
parent bd498499fd4e82709a7ebcc8f42d41aa1e1535b3
Author: MS <ms@taler.net>
Date:   Fri, 24 Jul 2020 10:10:03 +0200

Fix payto URIs

Diffstat:
M
bin/taler-config-instances
 | 
40
++++++++++++++++++++++++++--------------

1 file changed, 26 insertions(+), 14 deletions(-)
diff --git a/bin/taler-config-instances b/bin/taler-config-instances
@@ -10,6 +10,11 @@ if not MERCHANT_BACKEND_BASE_URL:
     print("TALER_ENV_MERCHANT_BACKEND not defined.  Please source the ~/activate file.")
     exit(1)
 
+TALER_ENV_NAME = environ.get("TALER_ENV_NAME")
+if not MERCHANT_BACKEND_BASE_URL:
+    print("TALER_ENV_NAME not defined.  Please source the ~/activate file.")
+    exit(1)
+
 INSTANCE_CONFIG_URL = urljoin(MERCHANT_BACKEND_BASE_URL, "/private/instances")
 
 def expectResponse(response, expected_status_codes):
@@ -21,9 +26,10 @@ def expectResponse(response, expected_status_codes):
     return response
 
 print("configuring Blog")
+BLOG_INSTANCE_ID="blog"
 blog_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="blog",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{BLOG_INSTANCE_ID}"],
+    id=BLOG_INSTANCE_ID,
     name="Blog",
     address=dict(),
     jurisdiction=dict(),
@@ -35,9 +41,10 @@ blog_config = dict(
 )
 
 print("configuring Donations")
+DONATIONS_INSTANCE_ID="donations"
 donations_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="donations",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{DONATIONS_INSTANCE_ID}"],
+    id=DONATIONS_INSTANCE_ID,
     name="Donations",
     address=dict(),
     jurisdiction=dict(),
@@ -49,9 +56,10 @@ donations_config = dict(
 )
 
 print("configuring Survey")
+SURVEY_INSTANCE_ID="survey"
 survey_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="survey",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{SURVEY_INSTANCE_ID}"],
+    id=SURVEY_INSTANCE_ID,
     name="Survey",
     address=dict(),
     jurisdiction=dict(),
@@ -63,9 +71,10 @@ survey_config = dict(
 )
 
 print("configuring PoS")
+POS_INSTANCE_ID="pos"
 pos_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="pos",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{POS_INSTANCE_ID}"],
+    id=POS_INSTANCE_ID,
     name="PoS",
     address=dict(),
     jurisdiction=dict(),
@@ -77,9 +86,10 @@ pos_config = dict(
 )
 
 print("configuring GNUnet")
+GNUNET_INSTANCE_ID="GNUnet"
 gnunet_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="GNUnet",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{GNUNET_INSTANCE_ID}"],
+    id=GNUNET_INSTANCE_ID,
     name="GNUnet",
     address=dict(),
     jurisdiction=dict(),
@@ -91,9 +101,10 @@ gnunet_config = dict(
 )
 
 print("configuring Taler")
+TALER_INSTANCE_ID="Taler"
 taler_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="Taler",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{TALER_INSTANCE_ID}"],
+    id=TALER_INSTANCE_ID,
     name="Taler",
     address=dict(),
     jurisdiction=dict(),
@@ -105,9 +116,10 @@ taler_config = dict(
 )
 
 print("configuring Tor")
+TOR_INSTANCE_ID="Tor"
 tor_config = dict(
-    payto_uris=["payto://x-taler-bank/"],
-    id="Tor",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/{TOR_INSTANCE_ID}"],
+    id=TOR_INSTANCE_ID,
     name="Tor",
     address=dict(),
     jurisdiction=dict(),