diff options
| m--------- | examples/blog/web-common | 0 | ||||
| m--------- | examples/shop/web-common | 0 | ||||
| -rw-r--r-- | src/backend/merchant.conf | 18 |
3 files changed, 0 insertions, 18 deletions
diff --git a/examples/blog/web-common b/examples/blog/web-common -Subproject 026ef2476676ef00b6c2a0cec135a8e64024ee5 +Subproject 80f1e2708dbe4b19349244b611a6167b4b7a98c diff --git a/examples/shop/web-common b/examples/shop/web-common -Subproject 026ef2476676ef00b6c2a0cec135a8e64024ee5 +Subproject 80f1e2708dbe4b19349244b611a6167b4b7a98c diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 90ed9143..71ca5c74 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -33,23 +33,5 @@ CONFIG = postgres:///talermerchant [merchant-instance-default] KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv -[merchant-instance-Tor] -KEYFILE = ${TALER_DATA_HOME}/merchant/tor.priv - -[merchant-instance-GNUnet] -KEYFILE = ${TALER_DATA_HOME}/merchant/gnunet.priv - -[merchant-instance-Taler] -KEYFILE = ${TALER_DATA_HOME}/merchant/taler.priv - [default-wireformat] TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json - -[Tor-wireformat] -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json - -[GNUnet-wireformat] -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/gnunet.json - -[Taler-wireformat] -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/taler.json |