summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-26 15:53:50 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-04-26 15:53:50 +0200
commitdfcb3f5ef2e555bf4e154fd81ea65cc21e00f2ea (patch)
tree69e5cb1e83234dd10ce54504a99858d1b765adb9
parentfef9ae8e5cd7f24aca92834603f3bc863960a2e7 (diff)
parent252b8b2077358f64382130519a6910252aeead14 (diff)
downloadbank-dfcb3f5ef2e555bf4e154fd81ea65cc21e00f2ea.tar.gz
bank-dfcb3f5ef2e555bf4e154fd81ea65cc21e00f2ea.tar.bz2
bank-dfcb3f5ef2e555bf4e154fd81ea65cc21e00f2ea.zip
Merge branch 'stable'
-rw-r--r--talerbank/settings.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/talerbank/settings.py b/talerbank/settings.py
index e0af0ed..0a20ac4 100644
--- a/talerbank/settings.py
+++ b/talerbank/settings.py
@@ -85,7 +85,8 @@ WSGI_APPLICATION = 'talerbank.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
-dbname = tc["bank"]["database"].value_string(default='talerbank', warn=True)
+dbname = tc.value_string("bank", "database", required=True)
+logger.info("using db '%s'", dbname)
DATABASES = {
'default': {
@@ -141,7 +142,7 @@ STATIC_ROOT = '/tmp/talerbankstatic/'
-TALER_CURRENCY = tc["taler"]["currency"].value_string(default="KUDOS", warn=True)
+TALER_CURRENCY = tc.value_string("taler", "currency", required=True)
TALER_PREDEFINED_ACCOUNTS = ['Tor', 'GNUnet', 'Taler', 'FSF']
TALER_EXPECTS_DONATIONS = ['Tor', 'GNUnet', 'Taler', 'FSF']