[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] branch master updated: making twisted UR
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] branch master updated: making twisted URLs optional |
Date: |
Wed, 26 Jun 2019 17:00:31 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 4078150 making twisted URLs optional
4078150 is described below
commit 4078150a1cfb1373819a864fe7eb626463aa58e6
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jun 26 17:00:25 2019 +0200
making twisted URLs optional
---
config/generate-config | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/config/generate-config b/config/generate-config
index 09c79b0..52656a8 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -144,7 +144,10 @@ def config(obj):
if obj.standalone:
obj.cfg_put("merchant-exchange-test", "url",
"https://env.taler.net/{}/exchange/".format(obj.envname))
else:
- obj.cfg_put("merchant-exchange-test", "url",
"https://twister-exchange.wild.gv.taler.net/")
+ if twisted:
+ obj.cfg_put("merchant-exchange-test", "url",
"https://twister-exchange.wild.gv.taler.net/")
+ else:
+ obj.cfg_put("merchant-exchange-test", "url",
"https://exchange.test.taler.net/")
obj.cfg_put("merchant-exchange-test", "master_key", obj.exchange_pub)
@@ -154,7 +157,10 @@ def config(obj):
obj.cfg_put("frontends", "backend",
"https://env.taler.net/{}/merchant-backend/".format(obj.envname))
else:
if "test" == obj.envname:
- obj.cfg_put("frontends", "backend",
"https://twister-backend.wild.gv.taler.net/")
+ if twisted:
+ obj.cfg_put("frontends", "backend",
"https://twister-backend.wild.gv.taler.net/")
+ else:
+ obj.cfg_put("frontends", "backend",
"https://backend.test.taler.net/")
else:
assert ("demo" == obj.envname)
obj.cfg_put("frontends", "backend",
"https://backend.{}.taler.net/".format(obj.envname))
@@ -198,7 +204,10 @@ def config(obj):
if obj.standalone:
obj.cfg_put("account-1", "url",
"payto://x-taler-bank/env.taler.net/{}/bank/2".format(obj.envname))
else:
- obj.cfg_put("account-1", "url",
"payto://x-taler-bank/twister-bank.wild.gv.taler.net/2")
+ if twisted:
+ obj.cfg_put("account-1", "url",
"payto://x-taler-bank/twister-bank.wild.gv.taler.net/2")
+ else:
+ obj.cfg_put("account-1", "url",
"payto://x-taler-bank/bank.test.taler.net/2")
obj.cfg_put("account-1", "wire_response",
"${TALER_DEPLOYMENT_SHARED}/exchange/wire/test.json")
obj.cfg_put("account-1", "plugin", "taler_bank")
@@ -266,7 +275,10 @@ def config(obj):
if obj.standalone:
obj.cfg_put("account-merchant", "url",
"payto://x-taler-bank/env.taler.net/{}/bank/{}".format(obj.envname, "3"))
else:
- obj.cfg_put("account-merchant", "url",
"payto://x-taler-bank/twister-bank.taler.net/3")
+ if twisted:
+ obj.cfg_put("account-merchant", "url",
"payto://x-taler-bank/twister-bank.taler.net/3")
+ else:
+ obj.cfg_put("account-merchant", "url",
"payto://x-taler-bank/bank.test.taler.net/3")
obj.cfg_put("account-merchant", "plugin", "taler_bank")
obj.cfg_put("account-merchant", "taler_bank_auth_method", "basic")
@@ -297,7 +309,8 @@ def config(obj):
@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, shared_outdir, exchange_pub, standalone):
+@click.option("--twisted", default=None)
+def main(currency, envname, outdir, shared_outdir, exchange_pub, standalone,
twisted):
if not standalone:
if envname not in ("demo", "test"):
@@ -318,7 +331,7 @@ def main(currency, envname, outdir, shared_outdir,
exchange_pub, standalone):
config(mc)
config_files.append(mc)
- if "test" == envname:
+ if "test" == envname and twisted:
# Twisting the exchange.
twist_exchange_conf = ConfigFile(standalone, envname, currency,
exchange_pub, "twister-exchange.conf")
twist_exchange_conf.cfg_put("twister", "serve", "unix")
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-deployment] branch master updated: making twisted URLs optional,
gnunet <=