From cfb0f5bdbcbdedd676744b6d33fae29ba3216a72 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 10 May 2016 13:50:01 +0200 Subject: including config generator among installed files --- src/exchange/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/exchange') diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am index 314bf8ba4..9ffd30e46 100644 --- a/src/exchange/Makefile.am +++ b/src/exchange/Makefile.am @@ -15,6 +15,9 @@ bin_PROGRAMS = \ taler-exchange-aggregator \ taler-exchange-httpd +dis_bin_SCRIPTS = \ + taler-config-generate + taler_exchange_aggregator_SOURCES = \ taler-exchange-aggregator.c taler_exchange_aggregator_LDADD = \ -- cgit v1.2.3 From 4a656428051a96a557bb876173b9461b83daa080 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 10 May 2016 13:51:18 +0200 Subject: typo --- src/exchange/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/exchange') diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am index 9ffd30e46..ff4fe91dc 100644 --- a/src/exchange/Makefile.am +++ b/src/exchange/Makefile.am @@ -15,7 +15,7 @@ bin_PROGRAMS = \ taler-exchange-aggregator \ taler-exchange-httpd -dis_bin_SCRIPTS = \ +dist_bin_SCRIPTS = \ taler-config-generate taler_exchange_aggregator_SOURCES = \ -- cgit v1.2.3 From 9aa8fa0d70f8c941f546ee42c389ae4c25739227 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 10 May 2016 14:23:59 +0200 Subject: typo: tears->years --- src/exchange/taler-config-generate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/exchange') diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate index 5693f920c..a928d12b2 100755 --- a/src/exchange/taler-config-generate +++ b/src/exchange/taler-config-generate @@ -217,7 +217,7 @@ do $CS -s $SECTION -o duration_overlap -V "1 day" || exit 1 $CS -s $SECTION -o duration_withdraw -V "7 days" || exit 1 $CS -s $SECTION -o duration_spend -V "2 years" || exit 1 - $CS -s $SECTION -o duration_legal -V "3 tears" || exit 1 + $CS -s $SECTION -o duration_legal -V "3 years" || exit 1 $CS -s $SECTION -o fee_withdraw -V "${ARG_CURRENCY}:0.01" || exit 1 $CS -s $SECTION -o fee_deposit -V "${ARG_CURRENCY}:0.01" || exit 1 $CS -s $SECTION -o fee_refresh -V "${ARG_CURRENCY}:0.01" || exit 1 @@ -232,7 +232,7 @@ do $CS -s $SECTION -o duration_overlap -V "1 day" || exit 1 $CS -s $SECTION -o duration_withdraw -V "7 days" || exit 1 $CS -s $SECTION -o duration_spend -V "2 years" || exit 1 - $CS -s $SECTION -o duration_legal -V "3 tears" || exit 1 + $CS -s $SECTION -o duration_legal -V "3 years" || exit 1 $CS -s $SECTION -o fee_withdraw -V "${ARG_CURRENCY}:0.01" || exit 1 $CS -s $SECTION -o fee_deposit -V "${ARG_CURRENCY}:0.01" || exit 1 $CS -s $SECTION -o fee_refresh -V "${ARG_CURRENCY}:0.01" || exit 1 -- cgit v1.2.3 From e10fc753df709cc9f6d4adddc7699640a52cf89e Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 10 May 2016 15:03:00 +0200 Subject: typo --- src/exchange/taler-config-generate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/exchange') diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate index a928d12b2..3e9d7a780 100755 --- a/src/exchange/taler-config-generate +++ b/src/exchange/taler-config-generate @@ -135,7 +135,7 @@ then then JSONF=`$CS -s merchant-wireformat -o ${ARG_W}_RESPONSE_FILE -f` mkdir -p `dirname "$JSONF"` - echo "$ARG_J" > "$JSONF" || exit 1 + echo "$ARG_JM" > "$JSONF" || exit 1 else echo "Skipped generating wire details for merchant" fi -- cgit v1.2.3 From be53397fb981db5af597bce0c3bc7c87491e9f84 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 10 May 2016 19:38:38 +0200 Subject: adding EDATE in merchant config generator --- src/exchange/taler-config-generate | 1 + 1 file changed, 1 insertion(+) (limited to 'src/exchange') diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate index 3e9d7a780..2490f0cb3 100755 --- a/src/exchange/taler-config-generate +++ b/src/exchange/taler-config-generate @@ -130,6 +130,7 @@ fi if (test 1 = "$ARG_M") then $CS -s merchant -o WIREFORMAT -V "$ARG_W" || exit 1 + $CS -s merchant -o EDATE -V "3 week" || exit 1 if (test ! -z "$ARG_JM") then -- cgit v1.2.3 From 17512aa538700fc5f2d23d42ab9020989b943bf7 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 10 May 2016 22:06:55 +0200 Subject: merchant private key in config generator --- src/exchange/taler-config-generate | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/exchange') diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate index 2490f0cb3..319455a2a 100755 --- a/src/exchange/taler-config-generate +++ b/src/exchange/taler-config-generate @@ -129,6 +129,15 @@ fi # Generate merchant-specific configuration if (test 1 = "$ARG_M") then + MASTER_KEY=`$CS -f -s merchant -o KEYFILE` + +# Generate master key (if missing) + if (test ! -e "$MASTER_KEY") + then + mkdir -p `dirname "$MASTER_KEY"` + gnunet-ecc -g 1 "$MASTER_KEY" || exit 1 + fi + $CS -s merchant -o WIREFORMAT -V "$ARG_W" || exit 1 $CS -s merchant -o EDATE -V "3 week" || exit 1 -- cgit v1.2.3 From 93175857c9c295483d76fe3c6b755ddf2c5ee865 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Wed, 11 May 2016 01:30:30 +0200 Subject: uncommenting PORT in config --- src/exchange/exchange.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/exchange') diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf index 7dffdd7fa..afb5b8fae 100644 --- a/src/exchange/exchange.conf +++ b/src/exchange/exchange.conf @@ -20,7 +20,7 @@ UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http UNIXPATH_MODE = 660 # HTTP port the exchange listens to -# PORT = 8081 +PORT = 8081 # Master public key used to sign the exchange's various keys # MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG -- cgit v1.2.3 From 5d2b56c3c39822b4af746142dd0f8a1676351ec5 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Wed, 11 May 2016 01:56:34 +0200 Subject: MASTER_KEY in section merchant-exchange-test used to point exchange's private key. Fixed --- src/exchange/taler-config-generate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/exchange') diff --git a/src/exchange/taler-config-generate b/src/exchange/taler-config-generate index 319455a2a..cc77d4798 100755 --- a/src/exchange/taler-config-generate +++ b/src/exchange/taler-config-generate @@ -211,7 +211,7 @@ then then EPORT=`$CS -s exchange -o PORT` $CS -s merchant-exchange-test -o URI -V "http://localhost:$EPORT/" || exit - $CS -s merchant-exchange-test -o MASTER_KEY -V "$MASTER_KEY" + $CS -s merchant-exchange-test -o MASTER_KEY -V `$CS -s exchange -o MASTER_PUBLIC_KEY` else echo "Need to be configuring exchange as well for -t to be useful." fi -- cgit v1.2.3