[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] branch master updated: add address info
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] branch master updated: add address info for merchants |
Date: |
Wed, 17 Jan 2018 23:33:10 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new e3ed88e add address info for merchants
e3ed88e is described below
commit e3ed88e2a29e696216dc1a2ad450c940ccf049b6
Author: Florian Dold <address@hidden>
AuthorDate: Wed Jan 17 23:32:42 2018 +0100
add address info for merchants
---
config/generate-config | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/config/generate-config b/config/generate-config
index 33c8167..37f5754 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -71,11 +71,6 @@ def config(currency, envname, exchange_pub, standalone):
cfg_put("donations", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi")
cfg_put("donations", "uwsgi_unixpath_mode", "660")
- cfg_put("backoffice-donations", "instances", "FSF GNUnet Tor Taler")
- cfg_put("backoffice-donations", "uwsgi_serve", "unix")
- cfg_put("backoffice-donations", "uwsgi_unixpath",
"$HOME/sockets/backoffice-donations.uwsgi")
- cfg_put("backoffice-donations", "uwsgi_unixpath_mode", "660")
-
cfg_put("survey", "uwsgi_serve", "unix")
cfg_put("survey", "uwsgi_unixpath", "$HOME/sockets/survey.uwsgi")
cfg_put("survey", "uwsgi_unixpath_mode", "660")
@@ -85,11 +80,6 @@ def config(currency, envname, exchange_pub, standalone):
cfg_put("blog", "uwsgi_unixpath_mode", "660")
cfg_put("blog", "instance", "FSF")
- cfg_put("backoffice-blog", "instances", "FSF")
- cfg_put("backoffice-blog", "uwsgi_serve", "unix")
- cfg_put("backoffice-blog", "uwsgi_unixpath",
"$HOME/sockets/backoffice-blog.uwsgi")
- cfg_put("backoffice-blog", "uwsgi_unixpath_mode", "660")
-
if standalone:
cfg_put("backoffice-blog", "backend",
"https://env.taler.net/{}/merchant-backend/".format(envname))
cfg_put("backoffice-donations", "backend",
"https://env.taler.net/{}/merchant-backend/".format(envname))
@@ -191,6 +181,9 @@ def config(currency, envname, exchange_pub, standalone):
# instance FSF
cfg_put("merchant-instance-FSF", "keyfile",
"${TALER_DEPLOYMENT_SHARED}/merchant/fsf.priv")
cfg_put("merchant-instance-FSF", "name", "Free Software Foundation")
+ cfg_put("merchant-location-FSF-address", "street", "51 Franklin Street,
Fifth Floor.")
+ cfg_put("merchant-location-FSF-address", "city", "Boston")
+ cfg_put("merchant-location-FSF-address", "country", "USA")
# instance Tor
cfg_put("merchant-instance-Tor", "keyfile",
"${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv")
cfg_put("merchant-instance-Tor", "name", "The Tor Project")
@@ -203,6 +196,7 @@ def config(currency, envname, exchange_pub, standalone):
# instance default
cfg_put("merchant-instance-default", "keyfile",
"${TALER_DEPLOYMENT_SHARED}/merchant/default.priv")
cfg_put("merchant-instance-default", "name", "Kudos Inc.")
+ cfg_put("merchant-location-default-address", "country", "Kudosland")
cfg_put("merchant-instance-default", "tip_reserve_priv_filename",
"${TALER_DEPLOYMENT_SHARED}/merchant/default-tip.priv")
cfg_put("merchant-instance-default", "tip_exchange",
"https://exchange.{}.taler.net/".format(envname))
# instance tutorial
--
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: add address info for merchants,
gnunet <=