summaryrefslogtreecommitdiff
path: root/src/backend/merchant.conf
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-03-27 22:47:55 +0200
committerChristian Grothoff <christian@grothoff.org>2018-04-15 12:21:14 +0200
commit0bf748cc19f37587c6c6fd82f26d66beb0758eba (patch)
tree8b32bdc4f56a51d46f96e33a43641b064284b2a7 /src/backend/merchant.conf
parentd880b374d01a031f8354bbaab3036544629b87ab (diff)
downloadmerchant-0bf748cc19f37587c6c6fd82f26d66beb0758eba.tar.gz
merchant-0bf748cc19f37587c6c6fd82f26d66beb0758eba.tar.bz2
merchant-0bf748cc19f37587c6c6fd82f26d66beb0758eba.zip
pre-merge changes towards #4939 patch
Diffstat (limited to 'src/backend/merchant.conf')
-rw-r--r--src/backend/merchant.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 45a13cff..e3e0a681 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -58,4 +58,9 @@ CONFIG = postgres:///talermerchant
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?
+# Inactive addresses (NO) will be supported for legacy contracts
+# but not used for new contracts.
+ACTIVE = YES