taler-deployment

commit 8684c735e1c0c2efee197a3918d39ea2036d2b78
parent 0c8ca526b64180da87edeaa509f785cb82109b45
Author: MS <ms@taler.net>
Date:   Fri, 24 Jul 2020 11:41:58 +0200

make currency choice more flexible

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

1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/bin/taler-config-instances b/bin/taler-config-instances
@@ -17,6 +17,7 @@ if not MERCHANT_BACKEND_BASE_URL:
     exit(1)
 
 TALER_PATCH_INSTANCES = environ.get("TALER_PATCH_INSTANCES")
+TALER_CONFIG_CURRENCY = environ.get("TALER_CONFIG_CURRENCY")
 
 def expectResponse(response, expected_status_codes):
     if response.status_code not in expected_status_codes:
@@ -53,9 +54,9 @@ blog = Instance(
         name="Blog",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),
@@ -70,9 +71,9 @@ donations = Instance(
         name="Donations",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),
@@ -87,9 +88,9 @@ survey = Instance(
         name="Survey",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),
@@ -104,9 +105,9 @@ pos = Instance(
         name="PoS",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),
@@ -121,9 +122,9 @@ gnunet = Instance(
         name="GNUnet",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),
@@ -138,9 +139,9 @@ taler = Instance(
         name="Taler",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),
@@ -155,9 +156,9 @@ tor = Instance(
         name="Tor",
         address=dict(),
         jurisdiction=dict(),
-        default_max_wire_fee="EUR:1",
+        default_max_wire_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_fee_amortization=3,
-        default_max_deposit_fee="EUR:1",
+        default_max_deposit_fee=f"{TALER_CONFIG_CURRENCY}:1",
         default_wire_transfer_delay=dict(d_ms="forever"),
         default_pay_delay=dict(d_ms="forever")
     ),