summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-11-19 19:15:02 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-11-19 19:15:02 +0100
commit31e465b67553cb649ef4b827ff1dd680a1d04e99 (patch)
tree94086893b7cd9767e86b5d02b622132d61f93f36
parent87050677866bf4d8792ecbccad0da252356e5c60 (diff)
downloaddeployment-31e465b67553cb649ef4b827ff1dd680a1d04e99.tar.gz
deployment-31e465b67553cb649ef4b827ff1dd680a1d04e99.tar.bz2
deployment-31e465b67553cb649ef4b827ff1dd680a1d04e99.zip
remove manual config files
-rw-r--r--config/demo.taler.net/taler.conf197
-rw-r--r--config/demo.taler.net/taler/exchange/wire/test.json8
-rw-r--r--config/demo.taler.net/taler/merchant/wire/fsf.json7
-rw-r--r--config/demo.taler.net/taler/merchant/wire/gnunet.json7
-rw-r--r--config/demo.taler.net/taler/merchant/wire/taler.json7
-rw-r--r--config/demo.taler.net/taler/merchant/wire/tor.json7
-rw-r--r--config/demo.taler.net/taler/merchant/wire/tutorial.json7
-rw-r--r--config/test.taler.net/taler.conf198
-rw-r--r--config/test.taler.net/taler/exchange/wire/test.json8
-rw-r--r--config/test.taler.net/taler/merchant/wire/fsf.json7
-rw-r--r--config/test.taler.net/taler/merchant/wire/gnunet.json7
-rw-r--r--config/test.taler.net/taler/merchant/wire/taler.json7
-rw-r--r--config/test.taler.net/taler/merchant/wire/tor.json7
-rw-r--r--config/test.taler.net/taler/merchant/wire/tutorial.json7
14 files changed, 0 insertions, 481 deletions
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf
deleted file mode 100644
index a552ef1..0000000
--- a/config/demo.taler.net/taler.conf
+++ /dev/null
@@ -1,197 +0,0 @@
-[paths]
-TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
-
-
-[taler]
-CURRENCY = KUDOS
-
-
-[bank]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/bank.uwsgi
-uwsgi_unixpath_mode = 660
-database = talerdemo
-
-
-[bank-admin]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/bank-admin.uwsgi
-uwsgi_unixpath_mode = 660
-
-
-[donations]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/donations.uwsgi
-
-
-[blog]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/blog.uwsgi
-instance = FSF
-
-
-[merchant]
-WIREFORMAT = test
-SERVE = unix
-UNIXPATH = $HOME/sockets/merchant.http
-KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
-WIRE_TRANSFER_DELAY = 1 m
-
-
-[merchantdb-postgres]
-CONFIG = postgres:///talerdemo
-
-
-[merchant-exchange-demo]
-URI = https://exchange.demo.taler.net/
-MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
-
-
-[frontends]
-BACKEND = https://shop.demo.taler.net/backend/
-FRACTION = 100000000
-
-
-[exchange]
-SERVE = unix
-UNIXPATH = $HOME/sockets/exchange.http
-MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv
-MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
-WIREFORMAT = test
-KEYDIR = ${TALER_DEPLOYMENT_SHARED}/exchange/live-keys/
-
-[exchange-admin]
-SERVE = unix
-UNIXPATH = $HOME/sockets/exchange-admin.http
-
-[exchangedb-postgres]
-DB_CONN_STR = "postgres:///talerdemo"
-
-
-[exchange-wire-outgoing-test]
-BANK_URI = https://bank.demo.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
-
-
-# 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 = KUDOS:0.10
-duration_overlap = 5 minutes
-duration_withdraw = 32 years
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = KUDOS:0.01
-fee_deposit = KUDOS:0.01
-fee_refresh = KUDOS:0.01
-fee_refund = KUDOS:0.01
-rsa_keysize = 1024
-
-
-[coin_pudos_1]
-value = KUDOS:1
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = KUDOS:0.01
-fee_deposit = KUDOS:0.01
-fee_refresh = KUDOS:0.01
-fee_refund = KUDOS:0.01
-rsa_keysize = 1024
-
-
-[coin_pudos_2]
-value = KUDOS:2
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = KUDOS:0.01
-fee_deposit = KUDOS:0.01
-fee_refresh = KUDOS:0.01
-fee_refund = KUDOS:0.01
-rsa_keysize = 1024
-
-
-[coin_pudos_5]
-value = KUDOS:5
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = KUDOS:0.01
-fee_deposit = KUDOS:0.01
-fee_refresh = KUDOS:0.01
-fee_refund = KUDOS:0.01
-rsa_keysize = 1024
-
-
-[coin_pudos_10]
-value = KUDOS:10
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = KUDOS:0.01
-fee_deposit = KUDOS:0.01
-fee_refresh = KUDOS:0.01
-fee_refund = KUDOS:0.01
-rsa_keysize = 1024
-
-
-[coin_pudos_1000]
-value = KUDOS:1000
-duration_overlap = 5 minutes
-duration_withdraw = 17 weeks
-duration_spend = 12 years
-duration_legal = 3 years
-fee_withdraw = KUDOS:0.01
-fee_deposit = KUDOS:0.01
-fee_refresh = KUDOS:0.01
-fee_refund = KUDOS:0.01
-rsa_keysize = 2048
-
-
-[merchant-instance-wireformat-Tor]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json
-
-[merchant-instance-wireformat-GNUnet]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/gnunet.json
-
-[merchant-instance-wireformat-Taler]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/taler.json
-
-[merchant-instance-wireformat-FSF]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/fsf.json
-
-[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
-
-[merchant-instance-FSF]
-KEYFILE = ${TALER_DATA_HOME}/merchant/fsf.priv
diff --git a/config/demo.taler.net/taler/exchange/wire/test.json b/config/demo.taler.net/taler/exchange/wire/test.json
deleted file mode 100644
index 2180c80..0000000
--- a/config/demo.taler.net/taler/exchange/wire/test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "sig": "Q5T9DZGDC4W4AAW77XXZ93M6ZAJYYQEWY80AGKWABA9DF87ZNA6KEEQMH33CE84A6N259CGN9TYS1H4DJ9YSZB6FBVRKCY1PSZNMW3G",
- "name": "The exchange",
- "account_number": 2,
- "type": "test",
- "bank_uri": "https://bank.demo.taler.net/",
- "salt": "8VGKPF66ZNRX49W648EER6A53QAD6Q7ZAKHN6BGCVN1RE0F46J127V381K9AB4BNM0G5B44CGGY1DRB5843ACX8SWZFX2FQ2K4V8TBG"
-}
diff --git a/config/demo.taler.net/taler/merchant/wire/fsf.json b/config/demo.taler.net/taler/merchant/wire/fsf.json
deleted file mode 100644
index 0a2126e..0000000
--- a/config/demo.taler.net/taler/merchant/wire/fsf.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.demo.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 6,
- "salt": "SALT"
-}
diff --git a/config/demo.taler.net/taler/merchant/wire/gnunet.json b/config/demo.taler.net/taler/merchant/wire/gnunet.json
deleted file mode 100644
index c37f31c..0000000
--- a/config/demo.taler.net/taler/merchant/wire/gnunet.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.demo.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 4,
- "salt": "SALT"
-}
diff --git a/config/demo.taler.net/taler/merchant/wire/taler.json b/config/demo.taler.net/taler/merchant/wire/taler.json
deleted file mode 100644
index e7c60c5..0000000
--- a/config/demo.taler.net/taler/merchant/wire/taler.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.demo.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 5,
- "salt": "SALT"
-}
diff --git a/config/demo.taler.net/taler/merchant/wire/tor.json b/config/demo.taler.net/taler/merchant/wire/tor.json
deleted file mode 100644
index 3c29fe4..0000000
--- a/config/demo.taler.net/taler/merchant/wire/tor.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.demo.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 3,
- "salt": "SALT"
-}
diff --git a/config/demo.taler.net/taler/merchant/wire/tutorial.json b/config/demo.taler.net/taler/merchant/wire/tutorial.json
deleted file mode 100644
index c37fb38..0000000
--- a/config/demo.taler.net/taler/merchant/wire/tutorial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.demo.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 7,
- "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
deleted file mode 100644
index 751d046..0000000
--- a/config/test.taler.net/taler.conf
+++ /dev/null
@@ -1,198 +0,0 @@
-[paths]
-TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
-
-
-[taler]
-CURRENCY = PUDOS
-
-
-[bank]
-uwsgi_serve = unix
-database = talertest
-uwsgi_unixpath = $HOME/sockets/bank.uwsgi
-uwsgi_unixpath_mode = 660
-fraction = 100000000
-
-
-[bank-admin]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/bank-admin.uwsgi
-uwsgi_unixpath_mode = 660
-
-[donations]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/donations.uwsgi
-
-
-[blog]
-uwsgi_serve = unix
-uwsgi_unixpath = $HOME/sockets/blog.uwsgi
-instance = FSF
-
-
-[merchant]
-WIREFORMAT = test
-SERVE = unix
-UNIXPATH = $HOME/sockets/merchant.http
-# WARNING: The following line may be obsolete.
-KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
-WIRE_TRANSFER_DELAY = 1 m
-
-
-[merchantdb-postgres]
-CONFIG = postgres:///talertest
-
-
-[merchant-exchange-test]
-URI = https://exchange.test.taler.net/
-MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
-
-
-[frontends]
-BACKEND = https://shop.test.taler.net/backend/
-FRACTION = 100000000
-
-
-[exchange]
-SERVE = unix
-UNIXPATH = $HOME/sockets/exchange.http
-MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv
-MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
-WIREFORMAT = test
-KEYDIR = ${TALER_DEPLOYMENT_SHARED}/exchange/live-keys/
-
-[exchange-admin]
-SERVE = unix
-UNIXPATH = $HOME/sockets/exchange-admin.http
-
-[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
-
-
-# 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:1.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
-
-
-[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
-
-[merchant-instance-FSF]
-KEYFILE = ${TALER_DATA_HOME}/merchant/fsf.priv
-
-[merchant-instance-wireformat-Tor]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tor.json
-
-[merchant-instance-wireformat-GNUnet]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/gnunet.json
-
-[merchant-instance-wireformat-Taler]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/taler.json
-
-[merchant-instance-wireformat-FSF]
-TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/fsf.json
diff --git a/config/test.taler.net/taler/exchange/wire/test.json b/config/test.taler.net/taler/exchange/wire/test.json
deleted file mode 100644
index d46c3c6..0000000
--- a/config/test.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/test.taler.net/taler/merchant/wire/fsf.json b/config/test.taler.net/taler/merchant/wire/fsf.json
deleted file mode 100644
index 3d62dc5..0000000
--- a/config/test.taler.net/taler/merchant/wire/fsf.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.test.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 6,
- "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler/merchant/wire/gnunet.json b/config/test.taler.net/taler/merchant/wire/gnunet.json
deleted file mode 100644
index 66f7276..0000000
--- a/config/test.taler.net/taler/merchant/wire/gnunet.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.test.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 4,
- "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler/merchant/wire/taler.json b/config/test.taler.net/taler/merchant/wire/taler.json
deleted file mode 100644
index 26ad2cb..0000000
--- a/config/test.taler.net/taler/merchant/wire/taler.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.test.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 5,
- "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler/merchant/wire/tor.json b/config/test.taler.net/taler/merchant/wire/tor.json
deleted file mode 100644
index d80e9b9..0000000
--- a/config/test.taler.net/taler/merchant/wire/tor.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.test.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 3,
- "salt": "SALT"
-}
diff --git a/config/test.taler.net/taler/merchant/wire/tutorial.json b/config/test.taler.net/taler/merchant/wire/tutorial.json
deleted file mode 100644
index 700322d..0000000
--- a/config/test.taler.net/taler/merchant/wire/tutorial.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type": "test",
- "bank_uri": "https://bank.test.taler.net/",
- "sig": "MERCHANTSIGNATURE",
- "account_number": 7,
- "salt": "SALT"
-}