rename config

4 files changed, 2 insertions, 168 deletions

diff --git a/config/taler.net/taler.conf b/config/taler.net/taler.conf
deleted file mode 100644
index 0995fd3..0000000
--- a/config/taler.net/taler.conf
+++ /dev/null
@@ -1,151 +0,0 @@
-[paths]
-TALER_CONFIG_HOME = ${TALER_DEPLOYMENT_BASE:-$HOME}/config
-# data that is shared across all deployments on e.g. one account
-TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
-
-[taler]
-CURRENCY = PUDOS
-
-[bank]
-uwsgi_serve = unix
-uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/bank.uwsgi
-
-[donations]
-uwsgi_serve = unix
-uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/donations.uwsgi
-
-[blog]
-uwsgi_serve = unix
-uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/blog.uwsgi
-
-[merchant]
-WIREFORMAT = test
-SERVE = unix
-UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/merchant.http
-KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
-
-[merchant-wireformat]
-BANK_URI = https://bank.test.taler.net/
-BANK_ACCOUNT_NUMBER = 3
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/taler/merchant/wire/test.json
-
-[merchantdb-postgres]
-CONFIG = postgres:///talerdemo
-
-[merchant-exchange-test]
-URI = https://exchange.test.taler.net/
-MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
-
-[exchange]
-SERVE = unix
-UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/exchange.http
-
-KEYDIR = ${TALER_DEPLOYMENT_SHARED:-$HOME}/exchange/live-keys/
-MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv
-
-MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
-WIREFORMAT = test
-TESTRUN = YES
-
-[exchangedb-postgres]
-DB_CONN_STR = "postgres:///talertest"
-
-[exchange-wire-outgoing-test]
-BANK_URI = https://bank.test.taler.net/
-BANK_ACCOUNT_NUMBER = 1
-EXCHANGE_ACCOUNT_NUMBER = 2
-
-[exchange_keys]
-# how long is one signkey valid?
-signkey_duration = 18 weeks
-
-# how long are the signatures with the signkey valid?
-legal_duration = 2 years
-
-# how long do we generate denomination and signing keys
-# ahead of time?
-lookahead_sign = 32 weeks 1 day
-
-# how long do we provide to clients denomination and signing keys
-# ahead of time?
-lookahead_provide = 4 weeks 1 day
-
-[merchant]
-EDATE = 3 week
-
-# Coin definitions are detected because the section
-# name begins with "coin_".  The rest of the
-# name is free, but of course following the convention
-# of "coin_$CURRENCY[_$SUBUNIT]_$VALUE" make sense.
-[coin_pudos_ct_10]
-value = PUDOS:0.10
-duration_overlap = 5 minutes
-duration_withdraw = 32 years
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = PUDOS:0.01
-fee_deposit = PUDOS:0.01
-fee_refresh = PUDOS:0.01
-fee_refund = PUDOS:0.01
-rsa_keysize = 1024
-
-
-[coin_pudos_1]
-value = PUDOS:1
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = PUDOS:0.01
-fee_deposit = PUDOS:0.01
-fee_refresh = PUDOS:0.01
-fee_refund = PUDOS:0.01
-rsa_keysize = 1024
-
-[coin_pudos_2]
-value = PUDOS:2
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = PUDOS:0.01
-fee_deposit = PUDOS:0.01
-fee_refresh = PUDOS:0.01
-fee_refund = PUDOS:0.01
-rsa_keysize = 1024
-
-[coin_pudos_5]
-value = PUDOS:5
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = PUDOS:0.01
-fee_deposit = PUDOS:0.01
-fee_refresh = PUDOS:0.01
-fee_refund = PUDOS:0.01
-rsa_keysize = 1024
-
-[coin_pudos_10]
-value = PUDOS:10
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = PUDOS:0.01
-fee_deposit = PUDOS:0.01
-fee_refresh = PUDOS:0.01
-fee_refund = PUDOS:0.01
-rsa_keysize = 1024
-
-[coin_pudos_1000]
-value = PUDOS:1000
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = PUDOS:0.01
-fee_deposit = PUDOS:0.01
-fee_refresh = PUDOS:0.01
-fee_refund = PUDOS:0.01
-rsa_keysize = 2048
diff --git a/config/taler.net/taler/exchange/wire/test.json b/config/taler.net/taler/exchange/wire/test.json
deleted file mode 100644
index d46c3c6..0000000
--- a/config/taler.net/taler/exchange/wire/test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "sig": "JE0QWGH1GSTB5QTC6MJZHAKPQBD1FRMPTGB3B5E0Q7MWCSEVX95JDTDGKH1AQBJ9R17KDQ1CB0XBCCW420Z2CXW9CZXXFEQJ2BKSG3G",
-  "name": "The exchange",
-  "account_number": 2,
-  "bank_uri": "https://bank.test.taler.net/",
-  "type": "test",
-  "salt": "P3SBRJE7QW43GR44CW2V921M7N2WEESTRJS39ZECDK60ZJ8VBDJMQ1QQS5HSZBT06DGEDEK654T8WX2C7BGRT6A2798EYJFECME3B3G"
-}
diff --git a/config/taler.net/taler/merchant/wire/test.json b/config/taler.net/taler/merchant/wire/test.json
deleted file mode 100644
index dbdd979..0000000
--- a/config/taler.net/taler/merchant/wire/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "test",
-  "bank_uri": "https://bank.test.taler.net/",
-  "sig": "MERCHANTSIGNATURE",
-  "account_number": 24,
-  "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
index 89dfbff..0995fd3 100644
--- a/config/test.taler.net/taler.conf
+++ b/config/test.taler.net/taler.conf
@@ -1,7 +1,7 @@
 [paths]
 TALER_CONFIG_HOME = ${TALER_DEPLOYMENT_BASE:-$HOME}/config
 # data that is shared across all deployments on e.g. one account
-TALER_DEPLOYMENT_SHARED = ${TALER_DEPLOYMENT_BASE:-$HOME}/shared
+TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
 
 [taler]
 CURRENCY = PUDOS
@@ -27,7 +27,7 @@ KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
 [merchant-wireformat]
 BANK_URI = https://bank.test.taler.net/
 BANK_ACCOUNT_NUMBER = 3
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json
+TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/taler/merchant/wire/test.json
 
 [merchantdb-postgres]
 CONFIG = postgres:///talerdemo