From b5cba3251053c22bf1df46282f1dd0a4c46f6a38 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 1 Mar 2016 15:35:04 +0100 Subject: renaming mint->exchange --- contrib/coverage.sh | 2 +- contrib/exchange-template/README | 1 + .../exchange-template/config/exchange-common.conf | 28 ++++++++++ .../exchange-template/config/exchange-keyup.conf | 64 ++++++++++++++++++++++ contrib/mint-template/README | 1 - contrib/mint-template/config/mint-common.conf | 28 ---------- contrib/mint-template/config/mint-keyup.conf | 64 ---------------------- 7 files changed, 94 insertions(+), 94 deletions(-) mode change 100755 => 100644 contrib/coverage.sh create mode 100644 contrib/exchange-template/README create mode 100644 contrib/exchange-template/config/exchange-common.conf create mode 100644 contrib/exchange-template/config/exchange-keyup.conf delete mode 100644 contrib/mint-template/README delete mode 100644 contrib/mint-template/config/mint-common.conf delete mode 100644 contrib/mint-template/config/mint-keyup.conf (limited to 'contrib') diff --git a/contrib/coverage.sh b/contrib/coverage.sh old mode 100755 new mode 100644 index 15318967c..cce622283 --- a/contrib/coverage.sh +++ b/contrib/coverage.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Run from 'taler-mint/' top-level directory to generate +# Run from 'taler-exchange/' top-level directory to generate # code coverage data. TOP=`pwd` mkdir -p doc/coverage/ diff --git a/contrib/exchange-template/README b/contrib/exchange-template/README new file mode 100644 index 000000000..dbbd5c304 --- /dev/null +++ b/contrib/exchange-template/README @@ -0,0 +1 @@ +This directory is a template for the exchange directory. diff --git a/contrib/exchange-template/config/exchange-common.conf b/contrib/exchange-template/config/exchange-common.conf new file mode 100644 index 000000000..cb34ddcd9 --- /dev/null +++ b/contrib/exchange-template/config/exchange-common.conf @@ -0,0 +1,28 @@ +[exchange] +# Currency supported by the exchange (can only be one) +CURRENCY = EUR + +# Wire format supported by the exchange, case-insensitive. +# Examples for formats include 'test' for testing and 'sepa' (for EU IBAN). +WIREFORMAT = SEPA + +# HTTP port the exchange listens to +PORT = 4241 + +# Master public key used to sign the exchange's various keys +MASTER_PUBLIC_KEY = NEGTF62MNGVPZNW19V7S3CRS9D7K04MAHDGX3N6WY2NXREN26J80 + +# How to access our database +DB = postgres + +TESTRUN = YES + +[exchangedb-postgres] + +DB_CONN_STR = "postgres:///talercheck" + +[exchange-wire-sepa] +SEPA_RESPONSE_FILE = "sepa.json" + +[exchange-wire-test] +REDIRECT_URL = "http://test/" diff --git a/contrib/exchange-template/config/exchange-keyup.conf b/contrib/exchange-template/config/exchange-keyup.conf new file mode 100644 index 000000000..7eebfe975 --- /dev/null +++ b/contrib/exchange-template/config/exchange-keyup.conf @@ -0,0 +1,64 @@ +[exchange_keys] + +# how long is one signkey valid? +signkey_duration = 4 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_eur_ct_10] +value = EUR:0.10 +duration_overlap = 5 minutes +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.01 +rsa_keysize = 1024 + +[coin_eur_5] +value = EUR:5 +duration_overlap = 5 minutes +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.01 +rsa_keysize = 1024 + +[coin_eur_10] +value = EUR:10 +duration_overlap = 5 minutes +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.01 +rsa_keysize = 1024 + +[coin_eur_1000] +value = EUR:1000 +duration_overlap = 5 minutes +duration_withdraw = 7 days +duration_spend = 2 years +duration_legal = 3 years +fee_withdraw = EUR:0.01 +fee_deposit = EUR:0.01 +fee_refresh = EUR:0.01 +rsa_keysize = 2048 diff --git a/contrib/mint-template/README b/contrib/mint-template/README deleted file mode 100644 index fce5e0180..000000000 --- a/contrib/mint-template/README +++ /dev/null @@ -1 +0,0 @@ -This directory is a template for the mint directory. diff --git a/contrib/mint-template/config/mint-common.conf b/contrib/mint-template/config/mint-common.conf deleted file mode 100644 index 78a3310a1..000000000 --- a/contrib/mint-template/config/mint-common.conf +++ /dev/null @@ -1,28 +0,0 @@ -[mint] -# Currency supported by the mint (can only be one) -CURRENCY = EUR - -# Wire format supported by the mint, case-insensitive. -# Examples for formats include 'test' for testing and 'sepa' (for EU IBAN). -WIREFORMAT = SEPA - -# HTTP port the mint listens to -PORT = 4241 - -# Master public key used to sign the mint's various keys -MASTER_PUBLIC_KEY = NEGTF62MNGVPZNW19V7S3CRS9D7K04MAHDGX3N6WY2NXREN26J80 - -# How to access our database -DB = postgres - -TESTRUN = YES - -[mintdb-postgres] - -DB_CONN_STR = "postgres:///talercheck" - -[mint-wire-sepa] -SEPA_RESPONSE_FILE = "sepa.json" - -[mint-wire-test] -REDIRECT_URL = "http://test/" diff --git a/contrib/mint-template/config/mint-keyup.conf b/contrib/mint-template/config/mint-keyup.conf deleted file mode 100644 index d8bbc9d20..000000000 --- a/contrib/mint-template/config/mint-keyup.conf +++ /dev/null @@ -1,64 +0,0 @@ -[mint_keys] - -# how long is one signkey valid? -signkey_duration = 4 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_eur_ct_10] -value = EUR:0.10 -duration_overlap = 5 minutes -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_5] -value = EUR:5 -duration_overlap = 5 minutes -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_10] -value = EUR:10 -duration_overlap = 5 minutes -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.01 -rsa_keysize = 1024 - -[coin_eur_1000] -value = EUR:1000 -duration_overlap = 5 minutes -duration_withdraw = 7 days -duration_spend = 2 years -duration_legal = 3 years -fee_withdraw = EUR:0.01 -fee_deposit = EUR:0.01 -fee_refresh = EUR:0.01 -rsa_keysize = 2048 -- cgit v1.2.3 From f746efecf78e06f56ad7193591574d374c19958a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 1 Mar 2016 16:10:41 +0100 Subject: rename section from exchange-wire- to wire- --- contrib/exchange-template/config/exchange-common.conf | 7 ++++--- src/exchange/taler-exchange-httpd_wire.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/exchange-template/config/exchange-common.conf b/contrib/exchange-template/config/exchange-common.conf index cb34ddcd9..5214fd816 100644 --- a/contrib/exchange-template/config/exchange-common.conf +++ b/contrib/exchange-template/config/exchange-common.conf @@ -15,14 +15,15 @@ MASTER_PUBLIC_KEY = NEGTF62MNGVPZNW19V7S3CRS9D7K04MAHDGX3N6WY2NXREN26J80 # How to access our database DB = postgres +# Is this for testing, or for real? TESTRUN = YES [exchangedb-postgres] - DB_CONN_STR = "postgres:///talercheck" -[exchange-wire-sepa] +[wire-sepa] SEPA_RESPONSE_FILE = "sepa.json" -[exchange-wire-test] +[wire-test] REDIRECT_URL = "http://test/" +BANK_URI = "http://bank/ diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c index ba763b64d..faf018b99 100644 --- a/src/exchange/taler-exchange-httpd_wire.c +++ b/src/exchange/taler-exchange-httpd_wire.c @@ -104,7 +104,7 @@ TMH_WIRE_handler_wire_test (struct TMH_RequestHandler *rh, } if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, - "exchange-wire-test", + "wire-test", "REDIRECT_URL", &wire_test_redirect)) { @@ -168,7 +168,7 @@ TMH_WIRE_handler_wire_sepa (struct TMH_RequestHandler *rh, /* Fetch reply */ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, - "exchange-wire-sepa", + "wire-sepa", "SEPA_RESPONSE_FILE", &sepa_wire_file)) { -- cgit v1.2.3