summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/taler-deployment-config-generate3
-rwxr-xr-xconfig/generate-config35
2 files changed, 20 insertions, 18 deletions
diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate
index 2066836..edf4360 100755
--- a/bin/taler-deployment-config-generate
+++ b/bin/taler-deployment-config-generate
@@ -35,6 +35,7 @@ exchange_pub=$(gnunet-ecc -p $HOME/shared-data/exchange/offline-keys/master.priv
$HOME/deployment/config/generate-config \
--exchange-pub "$exchange_pub" \
--currency "$TALER_CONFIG_CURRENCY" \
- --outdir ~/shared-config \
+ --outdir ~/.config \
+ --shared-outdir ~/shared-data \
--envname "$TALER_CONFIG_ENV" \
--standalone "${TALER_CONFIG_STANDALONE:-0}"
diff --git a/config/generate-config b/config/generate-config
index c832ae8..ff37f75 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -44,10 +44,6 @@ def coin(currency,
def config(currency, envname, exchange_pub, standalone):
cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data")
- if not standalone:
- cfg_put("paths", "TALER_DATA_HOME", "${HOME}/shared-data")
- cfg_put("paths", "TALER_CONFIG_HOME", "${HOME}/shared-config")
-
cfg_put("taler", "CURRENCY", currency)
cfg_put("bank", "uwsgi_serve", "unix")
@@ -163,17 +159,17 @@ def config(currency, envname, exchange_pub, standalone):
cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day")
- 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-tutorial", "KEYFILE", "${TALER_DATA_HOME}/merchant/tutorial.priv")
+ cfg_put("merchant-instance-FSF", "KEYFILE", "${TALER_DEPLOYMENT_SHARED}/merchant/fsf.priv")
+ cfg_put("merchant-instance-Tor", "KEYFILE", "${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv")
+ cfg_put("merchant-instance-GNUnet", "KEYFILE", "${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv")
+ cfg_put("merchant-instance-Taler", "KEYFILE", "${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv")
+ cfg_put("merchant-instance-tutorial", "KEYFILE", "${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.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")
- cfg_put("merchant-instance-wireformat-tutorial", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tutorial.json")
+ cfg_put("merchant-instance-wireformat-Tor", "TEST_RESPONSE_FILE", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/tor.json")
+ cfg_put("merchant-instance-wireformat-GNUnet", "TEST_RESPONSE_FILE", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/gnunet.json")
+ cfg_put("merchant-instance-wireformat-Taler", "TEST_RESPONSE_FILE", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/taler.json")
+ cfg_put("merchant-instance-wireformat-FSF", "TEST_RESPONSE_FILE", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/fsf.json")
+ cfg_put("merchant-instance-wireformat-tutorial", "TEST_RESPONSE_FILE", "${TALER_DEPLOYMENT_SHARED}/merchant/wire/tutorial.json")
coin(currency, "ct_10", "0.10")
coin(currency, "1", "1")
@@ -217,9 +213,10 @@ def exchange_wf(envname, wfname, acct_no, name, standalone):
@click.option("--currency", default="KUDOS")
@click.option("--envname", default="demo")
@click.option("--outdir", default=None)
+@click.option("--shared-outdir", default=None)
@click.option("--standalone", default=None, help="Enable a standalone/env deployment instead of test/demo")
@click.option("--exchange-pub", required=True)
-def main(currency, envname, outdir, exchange_pub, standalone):
+def main(currency, envname, outdir, shared-outdir, exchange_pub, standalone):
if not standalone:
if envname not in ("demo", "test"):
@@ -253,14 +250,18 @@ def main(currency, envname, outdir, exchange_pub, standalone):
tc = os.path.join(outdir, "taler.conf")
cfg_write(open(tc, "w"))
- d = os.path.join(outdir, "taler", "merchant", "wire")
+ else:
+ cfg_write(sys.stdout)
+
+ if shared-outdir:
+ d = os.path.join(shared-outdir, "merchant", "wire")
os.makedirs(d, exist_ok=True)
for name, data in merchant_wireformats:
f = open(os.path.join(d, name+".json"), "w")
f.write(data)
f.close()
- d = os.path.join(outdir, "taler", "exchange", "wire")
+ d = os.path.join(shared-outdir, "exchange", "wire")
os.makedirs(d, exist_ok=True)
for name, data in exchange_wireformats:
# These files must be signed by the exchange in