From 87050677866bf4d8792ecbccad0da252356e5c60 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:14:32 +0100 Subject: update config --- config/generate-config | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/config/generate-config b/config/generate-config index 78d52c6..01cb734 100755 --- a/config/generate-config +++ b/config/generate-config @@ -44,11 +44,16 @@ def coin(name, def config(currency, envname, exchange_pub): cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data") - cfg_put("taler", "CURRENCY", "PUDOS") + cfg_put("taler", "CURRENCY", currency) cfg_put("bank", "uwsgi_serve", "unix") cfg_put("bank", "uwsgi_unixpath", "$HOME/sockets/bank.uwsgi") - cfg_put("bank", "database", "talertest") + cfg_put("bank", "uwsgi_unixpath_mode", "660") + cfg_put("bank", "database", "taler"+envname) + + cfg_put("bank-admin", "uwsgi_serve", "unix") + cfg_put("bank-admin", "uwsgi_unixpath", "$HOME/sockets/bank-admin.uwsgi") + cfg_put("bank-admin", "uwsgi_unixpath_mode", "660") cfg_put("donations", "uwsgi_serve", "unix") cfg_put("donations", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") @@ -79,7 +84,7 @@ def config(currency, envname, exchange_pub): cfg_put("exchange-admin", "SERVE", "unix") cfg_put("exchange-admin", "unixpath", "$HOME/sockets/exchange-admin.http") - cfg_put("exchangedb-postgres", "DB_CONN_STR", "postgres:///talertest") + cfg_put("exchangedb-postgres", "DB_CONN_STR", "postgres:///taler{}".format(envname)) cfg_put("exchange-wire-outgoing-test", "bank_uri", "https://bank.{}.taler.net/".format(envname)) cfg_put("exchange-wire-outgoing-test", "bank_account_number", "1") @@ -97,14 +102,16 @@ def config(currency, envname, exchange_pub): cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day") - cfg_put("Tor-wireformat", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tor.json") - cfg_put("GNUnet-wireformat", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/gnunet.json") - cfg_put("Taler-wireformat", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/taler.json") + cfg_put("merchant-instance-FSF", "KEYFILE", "${TALER_DATA_HOME}/merchant/fsf.priv") cfg_put("merchant-instance-Tor", "KEYFILE", "${TALER_DATA_HOME}/merchant/tor.priv") cfg_put("merchant-instance-GNUnet", "KEYFILE", "${TALER_DATA_HOME}/merchant/gnunet.priv") cfg_put("merchant-instance-Taler", "KEYFILE", "${TALER_DATA_HOME}/merchant/taler.priv") + cfg_put("merchant-instance-wireformat-Tor", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tor.json") + cfg_put("merchant-instance-wireformat-GNUnet", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/gnunet.json") + cfg_put("merchant-instance-wireformat-Taler", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/taler.json") + cfg_put("merchant-instance-wireformat-FSF", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/fsf.json") coin(currency, "ct_10", "0.10") coin(currency, "1", "1") -- cgit v1.2.3