summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-26 15:14:17 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-04-26 15:14:17 +0200
commit867a877fd810425cb90a51a6aafc0dbc63f75b39 (patch)
tree8040c61bfc822e335e73c7959c0888830bb311f2
parentfe4df50b979d5572f8807582dd89a1888b91ad22 (diff)
downloaddeployment-867a877fd810425cb90a51a6aafc0dbc63f75b39.tar.gz
deployment-867a877fd810425cb90a51a6aafc0dbc63f75b39.tar.bz2
deployment-867a877fd810425cb90a51a6aafc0dbc63f75b39.zip
db config
-rw-r--r--config/demo.taler.net/taler.conf2
-rw-r--r--config/test.taler.net/taler.conf7
2 files changed, 7 insertions, 2 deletions
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf
index f7c64f6..1fe1e87 100644
--- a/config/demo.taler.net/taler.conf
+++ b/config/demo.taler.net/taler.conf
@@ -25,7 +25,7 @@ UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/merchant.http
KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
[merchant-wireformat]
-BANK_URI = https://bank.test.taler.net/
+BANK_URI = https://bank.demo.taler.net/
BANK_ACCOUNT_NUMBER = 3
TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
index 59f3f7d..c767bf0 100644
--- a/config/test.taler.net/taler.conf
+++ b/config/test.taler.net/taler.conf
@@ -9,6 +9,8 @@ CURRENCY = PUDOS
[bank]
uwsgi_serve = unix
uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/bank.uwsgi
+db = talerbank
+
[donations]
uwsgi_serve = unix
@@ -30,12 +32,15 @@ BANK_ACCOUNT_NUMBER = 3
TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
[merchantdb-postgres]
-CONFIG = postgres:///talerdemo
+CONFIG = postgres:///talertest
[merchant-exchange-test]
URI = https://exchange.test.taler.net/
MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
+[frontends]
+BACKEND = https://shop.test.taler.net/backend/
+
[exchange]
SERVE = unix
UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/exchange.http