summaryrefslogtreecommitdiff
path: root/src/backend/merchant.conf
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2015-12-07 15:51:26 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2015-12-07 15:51:26 +0100
commitfb3f721df8b4f31b28e89375eca9586149a6c353 (patch)
tree001b2eae3d91d7f6f03d75798ef29e63f4e49e39 /src/backend/merchant.conf
parent0eeda08acc6083244c5aef35e88a1f490dd07566 (diff)
downloadmerchant-fb3f721df8b4f31b28e89375eca9586149a6c353.tar.gz
merchant-fb3f721df8b4f31b28e89375eca9586149a6c353.tar.bz2
merchant-fb3f721df8b4f31b28e89375eca9586149a6c353.zip
Adding taler "demo" mint master key into config file
Diffstat (limited to 'src/backend/merchant.conf')
-rw-r--r--src/backend/merchant.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 91816ead..99d30b22 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -14,7 +14,7 @@ KEYFILE = merchant.priv
CURRENCY = KUDOS
# FIXME: to be revised
-TRUSTED_MINTS = taler x
+TRUSTED_MINTS = taler
# How quickly do we want the mint to send us our money?
# Used only if the frontend does not specify a value.
@@ -26,9 +26,7 @@ DB = postgres
[mint-taler]
URI = mint.demo.taler.net
-
-[mint-x]
-URI = mint.demo.taler.net
+MASTER_KEY = Q1WVGRGC1F4W7RYC6M23AEGFEXQEHQ730K3GG0B67VPHQSRR75H0
# Auditors must be in sections "auditor-", the rest of the section
# name could be anything.