diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-01-22 13:37:42 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-01-22 13:37:42 +0100 |
commit | 5f74af3124f2d7088800a7904aa5a9a2c1a0eae3 (patch) | |
tree | 38779f6a3c66e49fedd3085a1b5cbbd2ddc67d5c /config/generate-config | |
parent | 31d172d15a8867027e50c11ce44eabe12c084305 (diff) | |
download | deployment-5f74af3124f2d7088800a7904aa5a9a2c1a0eae3.tar.gz deployment-5f74af3124f2d7088800a7904aa5a9a2c1a0eae3.tar.bz2 deployment-5f74af3124f2d7088800a7904aa5a9a2c1a0eae3.zip |
simplify path config
Diffstat (limited to 'config/generate-config')
-rwxr-xr-x | config/generate-config | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/config/generate-config b/config/generate-config index 651763f..9279593 100755 --- a/config/generate-config +++ b/config/generate-config @@ -64,6 +64,7 @@ def coin(obj, def config(obj): obj.cfg_put("paths", "TALER_DEPLOYMENT_DATA", "${HOME}/taler-data") + obj.cfg_put("paths", "TALER_DATA_HOME", "${HOME}/taler-data") obj.cfg_put("taler", "CURRENCY", obj.currency) obj.cfg_put("taler", "CURRENCY_ROUND_UNIT", f"{obj.currency}:0.01") @@ -151,11 +152,9 @@ def config(obj): obj.cfg_put("merchant-exchange-{}".format(obj.currency), "currency", obj.currency) obj.cfg_put("merchant-exchange-{}".format(obj.currency), "base_url", "https://exchange.{}.taler.net/".format(obj.envname)) - obj.cfg_put("auditor", "auditor_priv_file", "${TALER_DEPLOYMENT_DATA}/auditor/offline-keys/auditor.priv") obj.cfg_put("auditor", "serve", "unix") obj.cfg_put("auditor", "auditor_url", "https://auditor.{}.taler.net/service/".format(obj.envname)) obj.cfg_put("auditor", "unixpath", "$HOME/sockets/auditor.http") - obj.cfg_put("auditor", "reports", "${TALER_DEPLOYMENT_DATA}/auditor/reports") obj.cfg_put("auditor", "tiny_amount", obj.currency + ":0.01") obj.cfg_put("exchange", "base_url", "https://exchange.{}.taler.net/".format(obj.envname)) @@ -165,13 +164,6 @@ 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("exchange", "master_priv_file", "${TALER_DEPLOYMENT_DATA}/exchange/offline-keys/master.priv") - obj.cfg_put("exchange", "keydir", "${TALER_DEPLOYMENT_DATA}/exchange/live-keys/") - - obj.cfg_put("exchangedb", "auditor_base_dir", "${TALER_DEPLOYMENT_DATA}/exchange/auditors/") - obj.cfg_put("exchangedb", "wirefee_base_dir", "${TALER_DEPLOYMENT_DATA}/exchange/wirefees/") - obj.cfg_put("exchangedb", "auditor_inputs", "${TALER_DEPLOYMENT_DATA}/exchange/auditor-inputs/") - 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)) @@ -183,7 +175,7 @@ def config(obj): bank_acct_url = f"https://bank.{obj.envname}.taler.net/taler-wire-gateway/Exchange/" obj.cfg_put("exchange-account-1", "payto_uri", "payto://x-taler-bank/bank.{}.taler.net/Exchange".format(obj.envname)) - obj.cfg_put("exchange-account-1", "wire_response", "${TALER_DEPLOYMENT_DATA}/exchange/wire/test.json") + obj.cfg_put("exchange-account-1", "wire_response", "${TALER_DATA_HOME}/exchange/wire/test.json") obj.cfg_put("exchange-account-1", "plugin", "taler_bank") obj.cfg_put("exchange-account-1", "wire_gateway_auth_method", "basic") obj.cfg_put("exchange-account-1", "wire_gateway_url", bank_acct_url) @@ -223,28 +215,28 @@ def config(obj): obj.cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day") # instance FSF - obj.cfg_put("instance-FSF", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/fsf.priv") + obj.cfg_put("instance-FSF", "keyfile", "${TALER_DATA_HOME}/merchant/fsf.priv") obj.cfg_put("instance-FSF", "name", "Free Software Foundation") obj.cfg_put("merchant-location-FSF-address", "street", "51 Franklin Street, Fifth Floor.") obj.cfg_put("merchant-location-FSF-address", "city", "Boston") obj.cfg_put("merchant-location-FSF-address", "country", "USA") # instance Tor - obj.cfg_put("instance-Tor", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/tor.priv") + obj.cfg_put("instance-Tor", "keyfile", "${TALER_DATA_HOME}/merchant/tor.priv") obj.cfg_put("instance-Tor", "name", "The Tor Project") # instance GNUnet - obj.cfg_put("instance-GNUnet", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/gnunet.priv") + obj.cfg_put("instance-GNUnet", "keyfile", "${TALER_DATA_HOME}/merchant/gnunet.priv") obj.cfg_put("instance-GNUnet", "name", "GNUnet Project") # instance Taler - obj.cfg_put("instance-Taler", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/taler.priv") + obj.cfg_put("instance-Taler", "keyfile", "${TALER_DATA_HOME}/merchant/taler.priv") obj.cfg_put("instance-Taler", "name", "Taler") # instance default - obj.cfg_put("instance-default", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/default.priv") + obj.cfg_put("instance-default", "keyfile", "${TALER_DATA_HOME}/merchant/default.priv") obj.cfg_put("instance-default", "name", "Kudos Inc.") obj.cfg_put("merchant-location-default-address", "country", "Kudosland") - obj.cfg_put("instance-default", "tip_reserve_priv_filename", "${TALER_DEPLOYMENT_DATA}/merchant/default-tip.priv") + obj.cfg_put("instance-default", "tip_reserve_priv_filename", "${TALER_DATA_HOME}/merchant/default-tip.priv") obj.cfg_put("instance-default", "tip_exchange", "https://exchange.{}.taler.net/".format(obj.envname)) # instance tutorial - obj.cfg_put("instance-Tutorial", "keyfile", "${TALER_DEPLOYMENT_DATA}/merchant/tutorial.priv") + obj.cfg_put("instance-Tutorial", "keyfile", "${TALER_DATA_HOME}/merchant/tutorial.priv") obj.cfg_put("instance-Tutorial", "name", "Tutorial") if "demo" != obj.envname and obj.twisted: @@ -252,7 +244,7 @@ def config(obj): else: obj.cfg_put("merchant-account-merchant", "payto_uri", "payto://x-taler-bank/bank.{}.taler.net/Tutorial".format(obj.envname)) - obj.cfg_put("merchant-account-merchant", "wire_response", "${TALER_DEPLOYMENT_DATA}/merchant/wire/merchant.json") + 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") obj.cfg_put("merchant-account-merchant", "HONOR_default", "YES") |