[taler-deployment] branch master updated: sync config

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new b3ca1dc  sync config
b3ca1dc is described below

commit b3ca1dc03a39b1ec5c12211028a6eb416b94abcf
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Dec 2 00:51:14 2020 +0100

    sync config
---
 bin/taler-config-generate | 109 +++++++++++++++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 36 deletions(-)

diff --git a/bin/taler-config-generate b/bin/taler-config-generate
index ad35014..000e497 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-config-generate
@@ -8,6 +8,7 @@ import urllib.parse
 import stat
 from taler_urls import get_urls, get_port
 
+
 class ConfigFile:
     def __init__(self, envname, currency, exchange_pub, filename):
         self.sections = OrderedDict()
@@ -38,28 +39,32 @@ class ConfigFile:
             fstream.write("\n")
         fstream.close()
 
-def coin(obj,
-         name,
-         value,
-         d_withdraw="3 years",
-         d_spend="5 years",
-         d_legal="10 years",
-         f_withdraw="0.01",
-         f_deposit="0.01",
-         f_refresh="0.01",
-         f_refund="0.01",
-         rsa_keysize="2048"):
-    sec = "coin_"+obj.currency+"_"+name
-    obj.cfg_put(sec, "value", obj.currency+":"+value)
+
+def coin(
+    obj,
+    name,
+    value,
+    d_withdraw="3 years",
+    d_spend="5 years",
+    d_legal="10 years",
+    f_withdraw="0.01",
+    f_deposit="0.01",
+    f_refresh="0.01",
+    f_refund="0.01",
+    rsa_keysize="2048",
+):
+    sec = "coin_" + obj.currency + "_" + name
+    obj.cfg_put(sec, "value", obj.currency + ":" + value)
     obj.cfg_put(sec, "duration_withdraw", d_withdraw)
     obj.cfg_put(sec, "duration_spend", d_spend)
     obj.cfg_put(sec, "duration_legal", d_legal)
-    obj.cfg_put(sec, "fee_withdraw", obj.currency+":"+f_withdraw)
-    obj.cfg_put(sec, "fee_refresh", obj.currency+":"+f_refresh)
-    obj.cfg_put(sec, "fee_refund", obj.currency+":"+f_refund)
-    obj.cfg_put(sec, "fee_deposit", obj.currency+":"+f_deposit)
+    obj.cfg_put(sec, "fee_withdraw", obj.currency + ":" + f_withdraw)
+    obj.cfg_put(sec, "fee_refresh", obj.currency + ":" + f_refresh)
+    obj.cfg_put(sec, "fee_refund", obj.currency + ":" + f_refund)
+    obj.cfg_put(sec, "fee_deposit", obj.currency + ":" + f_deposit)
     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")
@@ -75,7 +80,7 @@ def config(obj):
         obj.cfg_put("bank", "serve", "http")
         obj.cfg_put("bank", "http_port", get_port(urls["bank"]))
 
-    obj.cfg_put("bank", "database", "taler"+obj.envname)
+    obj.cfg_put("bank", "database", "taler" + obj.envname)
     obj.cfg_put("bank", "max_debt", "%s:500.0" % obj.currency)
     obj.cfg_put("bank", "max_debt_bank", "%s:1000000000.0" % obj.currency)
     obj.cfg_put("bank", "allow_registrations", "YES")
@@ -126,22 +131,30 @@ def config(obj):
     obj.cfg_put("merchant", "wire_transfer_delay", "0 s")
     obj.cfg_put("merchant", "default_max_wire_fee", obj.currency + ":" + 
"0.01")
     obj.cfg_put("merchant", "default_max_deposit_fee", obj.currency + ":" + 
"0.05")
-    obj.cfg_put("merchantdb-postgres", "config", 
"postgres:///taler{}".format(obj.envname))
+    obj.cfg_put(
+        "merchantdb-postgres", "config", 
"postgres:///taler{}".format(obj.envname)
+    )
 
     obj.cfg_put("frontends", "backend_apikey", "sandbox")
     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), "master_key", 
obj.exchange_pub
+    )
     obj.cfg_put("merchant-exchange-{}".format(obj.currency), "currency", 
obj.currency)
 
-    obj.cfg_put("merchant-exchange-{}".format(obj.currency), 
"exchange_base_url", urls["exchange"])
+    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", 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", urls["exchange"])
-    
+
     if obj.envname != "local":
         obj.cfg_put("exchange", "serve", "unix")
         obj.cfg_put("exchange", "unixpath", "$HOME/sockets/exchange.http")
@@ -153,15 +166,29 @@ def config(obj):
     obj.cfg_put("exchange", "terms_etag", "0")
     obj.cfg_put("exchange", "terms_dir", 
"$HOME/local/share/taler-exchange/tos")
 
-    obj.cfg_put("exchangedb-postgres", "db_conn_str", 
"postgres:///taler{}".format(obj.envname))
-    obj.cfg_put("exchangedb-postgres", "config", 
"postgres:///taler{}".format(obj.envname))
-    obj.cfg_put("auditordb-postgres", "db_conn_str", 
"postgres:///taler{}".format(obj.envname))
-    obj.cfg_put("auditordb-postgres", "config", 
"postgres:///taler{}".format(obj.envname))
+    obj.cfg_put(
+        "exchangedb-postgres", "db_conn_str", 
"postgres:///taler{}".format(obj.envname)
+    )
+    obj.cfg_put(
+        "exchangedb-postgres", "config", 
"postgres:///taler{}".format(obj.envname)
+    )
+    obj.cfg_put(
+        "auditordb-postgres", "db_conn_str", 
"postgres:///taler{}".format(obj.envname)
+    )
+    obj.cfg_put(
+        "auditordb-postgres", "config", 
"postgres:///taler{}".format(obj.envname)
+    )
 
     bank_acct_url = "{}taler-wire-gateway/Exchange/".format(urls["bank"])
 
-    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", "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)
     obj.cfg_put("exchange-account-1", "username", "Exchange")
@@ -202,9 +229,16 @@ def config(obj):
     obj.cfg_put("exchange_keys", "lookahead_sign", "32 weeks 1 day")
     obj.cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day")
 
-
-    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",
+        "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")
 
     # The following block should be obsoleted by the new API to configure 
instances.
@@ -220,6 +254,7 @@ def config(obj):
     coin(obj, "10", "10")
     coin(obj, "1000", "1000")
 
+
 @click.command()
 @click.option("--currency", default="KUDOS")
 @click.option("--envname", default="demo")
@@ -239,17 +274,19 @@ def main(currency, envname, outdir, exchange_pub):
     config_files.append(mc)
 
     sc = ConfigFile(envname, currency, exchange_pub, "sync.conf")
-    sc.cfg_put("sync", "annual_fee", sc.currency+":0.1")
-    sc.cfg_put("sync", "serve", "unix")
-    sc.cfg_put("syncdb-postgres", "config", "postgres:///taler%s" % envname)
-    sc.cfg_put("sync", "unixpath", "$HOME/sockets/sync.http")
     sc.cfg_put("taler", "currency", sc.currency)
+    sc.cfg_put("sync", "serve", "unix")
     sc.cfg_put("sync", "unixpath", "$HOME/sockets/sync.http")
+    sc.cfg_put("sync", "annual_fee", sc.currency + ":0.1")
+    sc.cfg_put("sync", "fulfillment_url", "taler://fulfillment-success/")
+    sc.cfg_put("sync", "payment_backend_url", urls["merchant_backend"])
+    sc.cfg_put("syncdb-postgres", "config", "postgres:///taler%s" % envname)
     config_files.append(sc)
 
-    assert (0 < len(config_files))
+    assert 0 < len(config_files)
     for obj in config_files:
         obj.cfg_write(outdir)
 
+
 if __name__ == "__main__":
     main()

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.