gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-deployment] branch master updated: taler-local: offer custom DB n


From: gnunet
Subject: [taler-deployment] branch master updated: taler-local: offer custom DB name option
Date: Wed, 08 Dec 2021 20:20:02 +0100

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

ms pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 1787dff  taler-local: offer custom DB name option
1787dff is described below

commit 1787dffc32fcc8eeb5a53c2d5625b88aed653c1d
Author: ms <ms@taler.net>
AuthorDate: Wed Dec 8 20:19:39 2021 +0100

    taler-local: offer custom DB name option
---
 bin/WIP/taler-local | 49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/bin/WIP/taler-local b/bin/WIP/taler-local
index d54e847..89532f5 100755
--- a/bin/WIP/taler-local
+++ b/bin/WIP/taler-local
@@ -458,7 +458,12 @@ CURRENCY = "EUR"
     help="Instruct Nginx to set PROTO as the X-Forwarded-Proto.",
     default="http"
 )
-def prepare(x_forwarded_host, x_forwarded_proto):
+@click.option(
+    "--postgres-db-name", metavar="DBNAME",
+    help="Set postgres database name for all the services.",
+    default="taler"
+)
+def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name):
 
     """Generate configuration, run-time blobs, instances, euFin accounts."""
 
@@ -859,7 +864,8 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         exchange_wire_gateway_username,
         exchange_wire_gateway_password,
         frontend_api_key,
-        taler_runtime_dir
+        taler_runtime_dir,
+        postgres_db_name
     ):
         def coin(
             obj,
@@ -903,7 +909,7 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         obj.cfg_put("bank", "max_debt_bank", "%s:1000000000.0" % currency)
         obj.cfg_put("bank", "allow_registrations", "YES")
         obj.cfg_put("bank", "base_url", rev_proxy_url + "/bank/")
-        obj.cfg_put("bank", "database", "postgres:///taler")
+        obj.cfg_put("bank", "database", f"postgres:///{postgres_db_name}")
         obj.cfg_put("bank", "suggested_exchange", rev_proxy_url + "/exchange/")
     
         obj.cfg_put("donations", "serve", "http")
@@ -932,7 +938,7 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         obj.cfg_put("merchant", "wire_transfer_delay", "0 s")
         obj.cfg_put("merchant", "default_max_wire_fee", currency + ":" + 
"0.01")
         obj.cfg_put("merchant", "default_max_deposit_fee", currency + ":" + 
"0.05")
-        obj.cfg_put("merchantdb-postgres", "config", "postgres:///taler")
+        obj.cfg_put("merchantdb-postgres", "config", 
f"postgres:///{postgres_db_name}")
     
         obj.cfg_put("frontends", "backend", rev_proxy_url + 
"/merchant-backend/")
         obj.cfg_put(
@@ -971,10 +977,10 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         obj.cfg_put("exchange", "privacy_etag", "0")
         obj.cfg_put("exchange", "privacy_dir", 
"$HOME/.local/share/taler-exchange/pp")
     
-        obj.cfg_put("exchangedb-postgres", "db_conn_str", "postgres:///taler")
-        obj.cfg_put("exchangedb-postgres", "config", "postgres:///taler")
-        obj.cfg_put("auditordb-postgres", "db_conn_str", "postgres:///taler")
-        obj.cfg_put("auditordb-postgres", "config", "postgres:///taler")
+        obj.cfg_put("exchangedb-postgres", "db_conn_str", 
f"postgres:///{postgres_db_name}")
+        obj.cfg_put("exchangedb-postgres", "config", 
f"postgres:///{postgres_db_name}")
+        obj.cfg_put("auditordb-postgres", "db_conn_str", 
f"postgres:///{postgres_db_name}")
+        obj.cfg_put("auditordb-postgres", "config", 
f"postgres:///{postgres_db_name}")
         obj.cfg_put("exchange-account-1", "enable_debit", "yes")
         obj.cfg_put("exchange-account-1", "enable_credit", "yes")
         obj.cfg_put("merchant-account-merchant",
@@ -993,7 +999,13 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         obj.cfg_write(outdir)
         return obj
     
-    def config_sync(filename, outdir, unix_sockets_dir, currency, api_key, 
rev_proxy_url):
+    def config_sync(
+            filename, outdir,
+            unix_sockets_dir,
+            currency, api_key,
+            rev_proxy_url,
+            postgres_db_name
+    ):
         obj = ConfigFile(filename)
         obj.cfg_put("taler", "currency", currency)
         obj.cfg_put("sync", "serve", "unix")
@@ -1002,10 +1014,14 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         obj.cfg_put("sync", "annual_fee", f"{currency}:0.1")
         obj.cfg_put("sync", "fulfillment_url", "taler://fulfillment-success/")
         obj.cfg_put("sync", "payment_backend_url", rev_proxy_url + 
"merchant-backend/instances/Taler/")
-        obj.cfg_put("syncdb-postgres", "config", f"postgres:///taler")
+        obj.cfg_put("syncdb-postgres", "config", 
f"postgres:///{postgres_db_name}")
         obj.cfg_write(outdir)
     
-    def config_anastasis(filename, outdir, unix_sockets_dir, currency, 
rev_proxy_url, api_key):
+    def config_anastasis(
+            filename, outdir,
+            unix_sockets_dir,
+            currency, rev_proxy_url,
+            api_key, postgres_db_name):
         obj = ConfigFile(filename)
         obj.cfg_put("taler", "currency", currency)
         obj.cfg_put("anastasis", "serve", "unix")
@@ -1017,7 +1033,7 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         obj.cfg_put("anastasis", "truth_upload_fee", f"{currency}:0")
         obj.cfg_put("anastasis", "fulfillment_url", 
"taler://fulfillment-success/")
         obj.cfg_put("anastasis", "server_salt", "kreb3ia9dmj43gfa")
-        obj.cfg_put("stasis-postgres", "config", f"postgres:///taler")
+        obj.cfg_put("stasis-postgres", "config", 
f"postgres:///{postgres_db_name}")
         obj.cfg_put("anastasis-merchant-backend",
                    "payment_backend_url",
                    rev_proxy_url + "merchant-backend/instances/anastasis/"
@@ -1073,7 +1089,8 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         exchange_wire_gateway_username=EXCHANGE_NEXUS_USERNAME,
         exchange_wire_gateway_password=EXCHANGE_NEXUS_PASSWORD,
         frontend_api_key=FRONTENDS_API_TOKEN,
-        taler_runtime_dir=TALER_RUNTIME_DIR
+        taler_runtime_dir=TALER_RUNTIME_DIR,
+        postgres_db_name=postgres_db_name
     )
     print(" OK")
 
@@ -1232,7 +1249,8 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         unix_sockets_dir=UNIX_SOCKETS_DIR,
         currency=CURRENCY,
         api_key=FRONTENDS_API_TOKEN,
-        rev_proxy_url=get_link()
+        rev_proxy_url=get_link(),
+        postgres_db_name=postgres_db_name
     )
     print(" OK")
     print_nn("Generating anastasis.conf...")
@@ -1242,7 +1260,8 @@ def prepare(x_forwarded_host, x_forwarded_proto):
         unix_sockets_dir=UNIX_SOCKETS_DIR,
         currency=CURRENCY,
         rev_proxy_url=get_link(),
-        api_key=FRONTENDS_API_TOKEN
+        api_key=FRONTENDS_API_TOKEN,
+        postgres_db_name=postgres_db_name
     )
     print(" OK")
     print_nn("Reset and init exchange DB..")

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]