diff options
Diffstat (limited to 'config')
| -rwxr-xr-x | config/generate-config | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/config/generate-config b/config/generate-config index da6a236..72beb8b 100755 --- a/config/generate-config +++ b/config/generate-config @@ -42,7 +42,7 @@ def coin(currency, cfg_put(sec, "fee_deposit", currency+":"+f_deposit) cfg_put(sec, "rsa_keysize", rsa_keysize) -def config(currency, envname, exchange_pub): +def config(currency, envname, exchange_pub, standalone): cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data") cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data") @@ -52,6 +52,10 @@ def config(currency, envname, exchange_pub): cfg_put("bank", "uwsgi_unixpath", "$HOME/sockets/bank.uwsgi") cfg_put("bank", "uwsgi_unixpath_mode", "660") cfg_put("bank", "database", "taler"+envname) + if standalone: + cfg_put("bank", "database", "postgres:///taler?host={}/sockets".format(os.getenv("HOME"))) + else: + cfg_put("bank", "database", "postgres:///taler{}".format(envname)) cfg_put("bank-admin", "uwsgi_serve", "unix") cfg_put("bank-admin", "uwsgi_unixpath", "$HOME/sockets/bank-admin.uwsgi") @@ -63,14 +67,16 @@ def config(currency, envname, exchange_pub): cfg_put("blog", "uwsgi_serve", "unix") cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/shop.uwsgi") cfg_put("blog", "instance", "FSF") - cfg_put("merchant", "WIREFORMAT", "test") cfg_put("merchant", "SERVE", "unix") cfg_put("merchant", "UNIXPATH", "$HOME/sockets/merchant.http") cfg_put("merchant", "WIRE_TRANSFER_DELAY", "1 m") - cfg_put("merchantdb-postgres", "CONFIG", "postgres:///taler{}".format(envname)) + if standalone: + cfg_put("merchantdb-postgres", "CONFIG", "postgres:///taler?host={}/sockets".format(os.getenv("HOME"))) + else: + cfg_put("merchantdb-postgres", "CONFIG", "postgres:///taler{}".format(envname)) cfg_put("merchant-exchange-test", "URI", "https://exchange.{}.taler.net/".format(envname)) cfg_put("merchant-exchange-test", "MASTER_KEY", exchange_pub) @@ -89,7 +95,10 @@ 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:///taler{}".format(envname)) + if standalone: + cfg_put("exchangedb-postgres", "CONFIG", "postgres:///taler?host={}/sockets".format(os.getenv("HOME"))) + else: + cfg_put("exchangedb-postgres", "CONFIG", "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") @@ -153,10 +162,11 @@ def exchange_wf(envname, wfname, acct_no, name): @click.option("--currency", default="KUDOS") @click.option("--envname", default="demo") @click.option("--outdir", default=None) +@click.option("--standalone", default=None) @click.option("--exchange-pub", required=True) def main(currency, envname, outdir, exchange_pub): - config(currency, envname, exchange_pub) + config(currency, envname, exchange_pub, standalone == "1") merchant_wireformats = [ merchant_wf(envname, "gnunet", 4), |