aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/merchant.conf16
-rw-r--r--src/backend/taler-merchant-httpd_auditors.c4
2 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index e7259506..eee0dfef 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -21,7 +21,8 @@ DB = postgres
# Which wireformat does this merchant use? (test/sepa/etc.)
# WIREFORMAT = "test"
-# Must match the specification given in [merchant-wireformat]
+# Determines which wire plugin will be used. We currently only
+# support one wire plugin at a time!
# Configuration for postgres database.
@@ -31,14 +32,7 @@ CONFIG = postgres:///talermerchant
# Configuration of our bank account details
[merchant-wireformat]
+# Default location for the 'test' wire plugin
TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
-# The values in this section must match the "WIREFORMAT" given in [merchant]:
-# * for SEPA:
-# IBAN = DE67830654080004822650
-# NAME = GNUNET E.V
-# BIC = GENODEF1SRL
-#
-# * for TEST:
-# ACCOUNT_NUMBER = 123456
-# BANK_URI = http://
-#
+# Default location for the 'sepa' wire plugin
+SEPA_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/sepa.json
diff --git a/src/backend/taler-merchant-httpd_auditors.c b/src/backend/taler-merchant-httpd_auditors.c
index 3c81a417..0b583fd4 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -128,8 +128,8 @@ parse_auditors (void *cls,
struct Auditor auditor;
if (0 != strncasecmp (section,
- "auditor-",
- strlen ("auditor-")))
+ "merchant-auditor-",
+ strlen ("merchant-auditor-")))
return;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,