summaryrefslogtreecommitdiff
path: root/src/backend/merchant.conf
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/merchant.conf')
-rw-r--r--src/backend/merchant.conf24
1 files changed, 19 insertions, 5 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index e3e0a681..3475fc9e 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -57,10 +57,24 @@ CONFIG = postgres:///talermerchant
[merchant-instance-default]
KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
-[merchant-instance-wireformat-default]
-# File where the merchant's address is provided.
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tutorial.json
-# Should this address be used in offers we create right now?
+[account-default]
+
+# payto://-URL of the merchant's bank account. Required.
+# URL = payto://x-taler-bank/bank/42
+
+# File where this account's salted wire address is provided.
+# File does not have to exist, will be generated from
+# BANK_URL if it is missing. File must match BANK_URL.
+WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/accounts/default.json
+
+# Can this address be used in previous offers for
+# instance "default"? Must be set to YES if ACTIVE_default is YES.
+# Note that "default" here must match the instance's section name.
+# The same account may be enabled/active in multiple instances.
+ENABLE_default = YES
+
+# Should this address be used in offers we create right now for
+# instance "default"?
# Inactive addresses (NO) will be supported for legacy contracts
# but not used for new contracts.
-ACTIVE = YES
+ACTIVE_default = YES