[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] branch master updated: fix object
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] branch master updated: fix object |
Date: |
Wed, 26 Jun 2019 17:07:34 +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 151bfdd fix object
151bfdd is described below
commit 151bfdd84f54dc0b1cbeb6cade592a65aee9d965
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jun 26 17:07:26 2019 +0200
fix object
---
config/generate-config | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/config/generate-config b/config/generate-config
index 52656a8..6c1fec0 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -8,12 +8,13 @@ import urllib.parse
import stat
class ConfigFile:
- def __init__(self, standalone, envname, currency, exchange_pub, filename):
+ def __init__(self, standalone, envname, currency, exchange_pub, twisted,
filename):
self.sections = OrderedDict()
self.envname = envname
self.standalone = standalone
self.filename = filename
self.currency = currency
+ self.twisted = twisted
self.exchange_pub = exchange_pub
def destroy(self):
@@ -144,7 +145,7 @@ def config(obj):
if obj.standalone:
obj.cfg_put("merchant-exchange-test", "url",
"https://env.taler.net/{}/exchange/".format(obj.envname))
else:
- if twisted:
+ if obj.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/")
@@ -157,7 +158,7 @@ def config(obj):
obj.cfg_put("frontends", "backend",
"https://env.taler.net/{}/merchant-backend/".format(obj.envname))
else:
if "test" == obj.envname:
- if twisted:
+ if obj.twisted:
obj.cfg_put("frontends", "backend",
"https://twister-backend.wild.gv.taler.net/")
else:
obj.cfg_put("frontends", "backend",
"https://backend.test.taler.net/")
@@ -204,7 +205,7 @@ 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:
- if twisted:
+ if obj.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")
@@ -275,7 +276,7 @@ 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:
- if twisted:
+ if obj.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")
@@ -327,7 +328,7 @@ def main(currency, envname, outdir, shared_outdir,
exchange_pub, standalone, twi
config_files = []
- mc = ConfigFile(standalone, envname, currency, exchange_pub, "taler.conf")
+ mc = ConfigFile(standalone, envname, currency, exchange_pub, twisted,
"taler.conf")
config(mc)
config_files.append(mc)
--
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: fix object,
gnunet <=