From 8450116616f5081032146111ae8554dfdc8836a9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 18 Nov 2016 21:19:13 +0100 Subject: add configuration for doc.taler.net --- etc/nginx/sites-enabled/docs-ssl.site | 21 +++++++++++++++++++++ etc/nginx/sites-enabled/docs.site | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 etc/nginx/sites-enabled/docs-ssl.site create mode 100644 etc/nginx/sites-enabled/docs.site diff --git a/etc/nginx/sites-enabled/docs-ssl.site b/etc/nginx/sites-enabled/docs-ssl.site new file mode 100644 index 0000000..b699cad --- /dev/null +++ b/etc/nginx/sites-enabled/docs-ssl.site @@ -0,0 +1,21 @@ +server { + listen 443 ssl; + listen [::]:443 ssl; ## listen for ipv4; this line is default and implied + # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 + + root /var/www/docs.taler.net/; + + # Make site accessible from http://localhost/ + server_name docs.taler.net; + server_name www.docs.taler.net; + + include conf.d/talerssl; + + location / { + autoindex off; + ssi off; +# ssi_last_modified on; + } + + include conf.d/favicon_robots; +} diff --git a/etc/nginx/sites-enabled/docs.site b/etc/nginx/sites-enabled/docs.site new file mode 100644 index 0000000..50cfdbe --- /dev/null +++ b/etc/nginx/sites-enabled/docs.site @@ -0,0 +1,19 @@ +server { + listen 80; + listen [::]:80; ## listen for ipv4; this line is default and implied + # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 + + root /var/www/docs.taler.net/; + + # Make site accessible from http://localhost/ + server_name docs.taler.net; + server_name www.docs.taler.net; + + location / { + autoindex off; + ssi off; +# ssi_last_modified on; + } + + include conf.d/favicon_robots; +} -- cgit v1.2.3 From d6a1bd2300ddfea1c7f48d34895bd474784c63ad Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 18 Nov 2016 22:37:49 +0100 Subject: cache image resources at the client --- etc/nginx/sites-enabled/www-ssl.site | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site index 605f45e..62ac399 100644 --- a/etc/nginx/sites-enabled/www-ssl.site +++ b/etc/nginx/sites-enabled/www-ssl.site @@ -26,9 +26,14 @@ server { rewrite ^/wallet$ /wallet.html break; } + location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { + expires 1y; + } + # Note: this will go to /var/www/(videos|releases), which we took out of Git location /videos { root /var/www; + expires max; } location /releases { -- cgit v1.2.3 From 23b0a31471ec58813ab6584e01015c25b878d748 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 18 Nov 2016 22:39:26 +0100 Subject: fix location --- etc/nginx/sites-enabled/www-ssl.site | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site index 62ac399..1c5dda9 100644 --- a/etc/nginx/sites-enabled/www-ssl.site +++ b/etc/nginx/sites-enabled/www-ssl.site @@ -27,6 +27,7 @@ server { } location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { + root /var/www/taler.net; expires 1y; } -- cgit v1.2.3 From c3e23e13dd725bc47a74734039da3a8b024d293f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 18 Nov 2016 22:43:36 +0100 Subject: enable gzip --- etc/nginx/sites-enabled/www-ssl.site | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site index 1c5dda9..4d598a2 100644 --- a/etc/nginx/sites-enabled/www-ssl.site +++ b/etc/nginx/sites-enabled/www-ssl.site @@ -26,7 +26,17 @@ server { rewrite ^/wallet$ /wallet.html break; } - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { + gzip on; + gzip_disable "msie6"; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_buffers 16 8k; + gzip_http_version 1.1; + gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; + + + location ~* \.(png|jpg|jpeg|gif|ico|svg|js|css)$ { root /var/www/taler.net; expires 1y; } -- cgit v1.2.3 From f11b9ebc0f1b0228f632e01ed3cc43f8d0dea279 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 18 Nov 2016 22:45:24 +0100 Subject: enable gzip for application/javascript --- etc/nginx/sites-enabled/www-ssl.site | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site index 4d598a2..7831d38 100644 --- a/etc/nginx/sites-enabled/www-ssl.site +++ b/etc/nginx/sites-enabled/www-ssl.site @@ -33,7 +33,7 @@ server { gzip_comp_level 6; gzip_buffers 16 8k; gzip_http_version 1.1; - gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; + gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript; location ~* \.(png|jpg|jpeg|gif|ico|svg|js|css)$ { -- cgit v1.2.3 From e120d5fc0930bee106e570c40d0e4c21c4229709 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 18 Nov 2016 23:11:33 +0100 Subject: add redirect for backoffice --- etc/nginx/conf.d/demo.redirects | 1 + etc/nginx/conf.d/test.redirects | 1 + 2 files changed, 2 insertions(+) diff --git a/etc/nginx/conf.d/demo.redirects b/etc/nginx/conf.d/demo.redirects index 143637c..b81800d 100644 --- a/etc/nginx/conf.d/demo.redirects +++ b/etc/nginx/conf.d/demo.redirects @@ -4,3 +4,4 @@ rewrite ^/bank(.*)$ $scheme://bank.demo.taler.net/$1 redirect; rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect; rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; + rewrite ^/blog/track$ $scheme://blog.demo.taler.net/track redirect; diff --git a/etc/nginx/conf.d/test.redirects b/etc/nginx/conf.d/test.redirects index 4d62bf0..e432ee6 100644 --- a/etc/nginx/conf.d/test.redirects +++ b/etc/nginx/conf.d/test.redirects @@ -4,3 +4,4 @@ rewrite ^/bank(.*)$ $scheme://bank.test.taler.net/$1 redirect; rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect; rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; + rewrite ^/blog/track$ $scheme://blog.test.taler.net/track redirect; -- cgit v1.2.3 From cecf8dbc78f654d4f4b9742ffc8193f911704a0c Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Sat, 19 Nov 2016 16:56:01 +0100 Subject: Exposing backend@test on port 80 --- etc/nginx/sites-enabled/test.site | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site index 9de7af4..67ae5af 100644 --- a/etc/nginx/sites-enabled/test.site +++ b/etc/nginx/sites-enabled/test.site @@ -1,7 +1,11 @@ server { listen 80; listen [::]:80; - server_name test.taler.net *.test.taler.net; + server_name test.taler.net + bank.test.taler.net + blog.test.taler.net + shop.test.taler.net + exchange.test.taler.net; rewrite ^ https://$host$request_uri? permanent; } @@ -69,7 +73,9 @@ server { server { listen 443 ssl; + listen 80; listen [::]:443 ssl; + listen [::]:80; server_name backend.test.taler.net; ssi on; include conf.d/test.redirects; -- cgit v1.2.3 From 870704d02bc8644986aa47d239cffbb37a042578 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Sat, 19 Nov 2016 17:02:33 +0100 Subject: Exposing public backend @demo on port 80 --- etc/nginx/sites-enabled/demo.site | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site index c231f78..c027648 100644 --- a/etc/nginx/sites-enabled/demo.site +++ b/etc/nginx/sites-enabled/demo.site @@ -1,7 +1,12 @@ server { listen 80; listen [::]:80; - server_name demo.taler.net *.demo.taler.net; + server_name demo.taler.net + bank.demo.taler.net + shop.demo.taler.net + blog.demo.taler.net + exchange.demo.taler.net; + rewrite ^ https://$host$request_uri? permanent; } @@ -45,7 +50,9 @@ server { server { listen 443 ssl; + listen 80; listen [::]:443 ssl; + listen [::]:80; server_name backend.demo.taler.net; ssi on; include conf.d/test.redirects; -- cgit v1.2.3 From 5c69f6365241870306d5b5bd0c8a4c0d2d2addd7 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 17:14:16 +0100 Subject: use git for gnunet and mhd --- bootstrap-bluegreen | 15 ++++++--------- taler-build/invalidate.sh | 12 +----------- taler-build/update_gnunet.sh | 9 +++++++-- taler-build/update_libmicrohttpd.sh | 9 +++++++-- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 36bc7d9..a5b7eda 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -19,8 +19,7 @@ set -eu usage() { - ech "Usage:" - echo "$0: DEPLOYMENT_BASENAME" + echo "Usage: $0 DEPLOYMENT_BASENAME" } if [ -z ${1+x} ]; then @@ -39,13 +38,11 @@ esac cd $HOME -if ! test -d $HOME/gnunet; then - svn checkout https://gnunet.org/svn/gnunet -fi - -if ! test -d $HOME/libmicrohttpd; then - svn checkout https://gnunet.org/svn/libmicrohttpd -fi +for component in gnunet libmicrohttps; do + if ! test -d $HOME/$component; then + git clone git://git@gnunet.org/$component.git + fi +done for component in bank merchant gnurl landing exchange merchant-frontends deployment; do if ! test -d $HOME/$component; then diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh index 5c1bc20..3c9a15b 100755 --- a/taler-build/invalidate.sh +++ b/taler-build/invalidate.sh @@ -8,7 +8,7 @@ set -eu -for component in deployment exchange merchant bank gnurl merchant-frontends landing; do +for component in deployment exchange merchant bank gnurl merchant-frontends landing gnunet libmicrohttpd; do cd $HOME/$component git fetch if git status -sb | grep behind; then @@ -16,13 +16,3 @@ for component in deployment exchange merchant bank gnurl merchant-frontends land rm -f $HOME/deployment/taler-build/$component-stamp fi done - -for component in gnunet libmicrohttpd; do - cd $HOME/$component - svnHead=$(svn info -r HEAD | awk '/^Revision/ {print $2}') - svnBase=$(svn info -r BASE | awk '/^Revision/ {print $2}') - if test $svnHead != $svnBase; then - echo "invalidating $component" - rm -f $HOME/deployment/taler-build/$component-stamp - fi -done diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh index c1a013e..a845d66 100755 --- a/taler-build/update_gnunet.sh +++ b/taler-build/update_gnunet.sh @@ -3,8 +3,13 @@ set -eu cd $HOME/gnunet/ -svn revert -R . -svn update +git clear -fdx + +# like "git pull", but robust against force pushes +# and local changes +git fetch +git reset --hard FETCH_HEAD + ./bootstrap ./configure --prefix=$HOME/local --enable-logging=verbose --with-libgnurl=$HOME/local --with-microhttpd=$HOME/local make diff --git a/taler-build/update_libmicrohttpd.sh b/taler-build/update_libmicrohttpd.sh index ba90b25..d02d853 100755 --- a/taler-build/update_libmicrohttpd.sh +++ b/taler-build/update_libmicrohttpd.sh @@ -1,8 +1,13 @@ #!/bin/bash cd $HOME/libmicrohttpd/ -svn revert -R . -svn update +git clean -fdx + +# like "git pull", but robust against force pushes +# and local changes +git fetch +git reset --hard FETCH_HEAD + ./bootstrap ./configure --prefix=$HOME/local make -- cgit v1.2.3 From eb7ff16042a40d7f57799c22d73f341a263cf8e3 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 17:31:07 +0100 Subject: towards auto-generated config --- bin/taler-deployment-start | 6 ++++++ bootstrap-bluegreen | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start index 9acfe47..19b0fa9 100755 --- a/bin/taler-deployment-start +++ b/bin/taler-deployment-start @@ -8,6 +8,12 @@ ulimit -c $((100 * 1024)) cd $HOME +if [[ ! -e ~/.config/taler.conf ]]; then + taler-deployment-config-generate +fi + +taler-deployment-config-sign + taler-deployment-arm -s taler-deployment-arm -i taler-exchange taler-deployment-arm -i taler-merchant diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index a5b7eda..11d1de7 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -19,7 +19,7 @@ set -eu usage() { - echo "Usage: $0 DEPLOYMENT_BASENAME" + echo "Usage: $0 ENVNAME" } if [ -z ${1+x} ]; then @@ -27,12 +27,14 @@ if [ -z ${1+x} ]; then exit 1 fi -DEPLOYMENT_BASENAME=$1 +ENVNAME=$1 BRANCH=master -case $DEPLOYMENT_BASENAME in +CURRENCY=PUDOS +case $ENVNAME in demo) BRANCH=stable + CURRENCY=KUDOS ;; esac @@ -59,10 +61,8 @@ cat >$HOME/activate < Date: Sat, 19 Nov 2016 17:33:19 +0100 Subject: fix gnunet url --- bootstrap-bluegreen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 11d1de7..5538c71 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -42,7 +42,7 @@ cd $HOME for component in gnunet libmicrohttps; do if ! test -d $HOME/$component; then - git clone git://git@gnunet.org/$component.git + git clone git://gnunet.org/$component.git fi done -- cgit v1.2.3 From 0429b7f83e997a82b38b5918c31370fe49203e1d Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 17:34:05 +0100 Subject: fix typo --- bootstrap-bluegreen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 5538c71..491df30 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -40,7 +40,7 @@ esac cd $HOME -for component in gnunet libmicrohttps; do +for component in gnunet libmicrohttpd; do if ! test -d $HOME/$component; then git clone git://gnunet.org/$component.git fi -- cgit v1.2.3 From db48d6f718382d9ea40f0e9fd91ab025228b7922 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 17:38:43 +0100 Subject: fix typo --- taler-build/update_gnunet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh index a845d66..04ebb57 100755 --- a/taler-build/update_gnunet.sh +++ b/taler-build/update_gnunet.sh @@ -3,7 +3,7 @@ set -eu cd $HOME/gnunet/ -git clear -fdx +git clean -fdx # like "git pull", but robust against force pushes # and local changes -- cgit v1.2.3 From 86c652814ba2f314a8c6660b19388fd1855ffcc0 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 17:55:12 +0100 Subject: conf gen --- bin/taler-deployment-config-generate | 29 +++++++++++++++++++++++++++++ bin/taler-deployment-config-sign | 6 ++++++ 2 files changed, 35 insertions(+) create mode 100755 bin/taler-deployment-config-generate create mode 100755 bin/taler-deployment-config-sign diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate new file mode 100755 index 0000000..52c7f46 --- /dev/null +++ b/bin/taler-deployment-config-generate @@ -0,0 +1,29 @@ +#!/bin/bash + +# (Re-)generate the taler configuration based on environment variables. +# These variables are usually defined in ~/activate. +# Some configuration files still need to be signed with taler-deployment-config-sign. + +set -eu + +base=$HOME + +export PATH="$base/deployment":$PATH + +if [[ -z ${TALER_CONFIG_ENV+x} ]]; + echo "TALER_CONFIG_ENV not set" + exit 1 +fi + +if [[ -z ${TALER_CONFIG_CURRENCY+x} ]]; + echo "TALER_CONFIG_CURRENCY not set" + exit 1 +fi + +exchange_pub=$(gnunet-ecc -p ~/shared-data/exchange/offline-keys/master.priv) + +~/deployment/config/generate-config \ + --exchange-pub "$exchange_pub" \ + --currency "$TALER_CONFIG_CURRENCY" \ + --outdir ~/.config \ + --envname "$TALER_CONFIG_ENV" diff --git a/bin/taler-deployment-config-sign b/bin/taler-deployment-config-sign new file mode 100755 index 0000000..bc3f222 --- /dev/null +++ b/bin/taler-deployment-config-sign @@ -0,0 +1,6 @@ +#!/bin/bash + +base=$HOME + +export PATH="$base/deployment":$PATH + -- cgit v1.2.3 From 149ccaf9a0e52b33f4091ec103582b9e9ff273da Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 17:55:53 +0100 Subject: bash syntax --- bin/taler-deployment-config-generate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate index 52c7f46..deb20d4 100755 --- a/bin/taler-deployment-config-generate +++ b/bin/taler-deployment-config-generate @@ -10,12 +10,12 @@ base=$HOME export PATH="$base/deployment":$PATH -if [[ -z ${TALER_CONFIG_ENV+x} ]]; +if [[ -z ${TALER_CONFIG_ENV+x} ]]; then echo "TALER_CONFIG_ENV not set" exit 1 fi -if [[ -z ${TALER_CONFIG_CURRENCY+x} ]]; +if [[ -z ${TALER_CONFIG_CURRENCY+x} ]]; then echo "TALER_CONFIG_CURRENCY not set" exit 1 fi -- cgit v1.2.3 From d0df747a8cfcc4fef1f5d2f5faed18265f5aef14 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 18:40:32 +0100 Subject: conf signing --- bin/taler-deployment-config-sign | 8 +++++++- bootstrap-bluegreen | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/taler-deployment-config-sign b/bin/taler-deployment-config-sign index bc3f222..0f6e082 100755 --- a/bin/taler-deployment-config-sign +++ b/bin/taler-deployment-config-sign @@ -1,6 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash + +set -eu base=$HOME export PATH="$base/deployment":$PATH +for f in ~/.config/taler/exchange/wire/*.unsigned.json; do + taler-exchange-wire -j "$(<"$f")" > "${f%.unsigned.json}.json" +done + diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 491df30..fd70b37 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -46,6 +46,9 @@ for component in gnunet libmicrohttpd; do fi done +git -C ~/gnunet checkout tags/taler-0.2.0 +git -C ~/gnunet libmicrohttpd tags/v0.9.52 + for component in bank merchant gnurl landing exchange merchant-frontends deployment; do if ! test -d $HOME/$component; then git clone /var/git/$component.git -- cgit v1.2.3 From 50478ff8bb7405e70bbd8f9e2159741ed9060171 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 18:45:13 +0100 Subject: typo / be quiet when checking out detached head --- bootstrap-bluegreen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index fd70b37..f898b5a 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -46,8 +46,8 @@ for component in gnunet libmicrohttpd; do fi done -git -C ~/gnunet checkout tags/taler-0.2.0 -git -C ~/gnunet libmicrohttpd tags/v0.9.52 +git -C ~/gnunet checkout -q tags/taler-0.2.0 +git -C ~/libmicrohttpd checkout -q tags/v0.9.52 for component in bank merchant gnurl landing exchange merchant-frontends deployment; do if ! test -d $HOME/$component; then -- cgit v1.2.3 From 87050677866bf4d8792ecbccad0da252356e5c60 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:14:32 +0100 Subject: update config --- config/generate-config | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/config/generate-config b/config/generate-config index 78d52c6..01cb734 100755 --- a/config/generate-config +++ b/config/generate-config @@ -44,11 +44,16 @@ def coin(name, def config(currency, envname, exchange_pub): cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data") - cfg_put("taler", "CURRENCY", "PUDOS") + cfg_put("taler", "CURRENCY", currency) cfg_put("bank", "uwsgi_serve", "unix") cfg_put("bank", "uwsgi_unixpath", "$HOME/sockets/bank.uwsgi") - cfg_put("bank", "database", "talertest") + cfg_put("bank", "uwsgi_unixpath_mode", "660") + cfg_put("bank", "database", "taler"+envname) + + cfg_put("bank-admin", "uwsgi_serve", "unix") + cfg_put("bank-admin", "uwsgi_unixpath", "$HOME/sockets/bank-admin.uwsgi") + cfg_put("bank-admin", "uwsgi_unixpath_mode", "660") cfg_put("donations", "uwsgi_serve", "unix") cfg_put("donations", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") @@ -79,7 +84,7 @@ def config(currency, envname, exchange_pub): cfg_put("exchange-admin", "SERVE", "unix") cfg_put("exchange-admin", "unixpath", "$HOME/sockets/exchange-admin.http") - cfg_put("exchangedb-postgres", "DB_CONN_STR", "postgres:///talertest") + cfg_put("exchangedb-postgres", "DB_CONN_STR", "postgres:///taler{}".format(envname)) cfg_put("exchange-wire-outgoing-test", "bank_uri", "https://bank.{}.taler.net/".format(envname)) cfg_put("exchange-wire-outgoing-test", "bank_account_number", "1") @@ -97,14 +102,16 @@ def config(currency, envname, exchange_pub): cfg_put("exchange_keys", "lookahead_provide", "4 weeks 1 day") - cfg_put("Tor-wireformat", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tor.json") - cfg_put("GNUnet-wireformat", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/gnunet.json") - cfg_put("Taler-wireformat", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/taler.json") + cfg_put("merchant-instance-FSF", "KEYFILE", "${TALER_DATA_HOME}/merchant/fsf.priv") cfg_put("merchant-instance-Tor", "KEYFILE", "${TALER_DATA_HOME}/merchant/tor.priv") cfg_put("merchant-instance-GNUnet", "KEYFILE", "${TALER_DATA_HOME}/merchant/gnunet.priv") cfg_put("merchant-instance-Taler", "KEYFILE", "${TALER_DATA_HOME}/merchant/taler.priv") + cfg_put("merchant-instance-wireformat-Tor", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tor.json") + cfg_put("merchant-instance-wireformat-GNUnet", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/gnunet.json") + cfg_put("merchant-instance-wireformat-Taler", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/taler.json") + cfg_put("merchant-instance-wireformat-FSF", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/fsf.json") coin(currency, "ct_10", "0.10") coin(currency, "1", "1") -- cgit v1.2.3 From 31e465b67553cb649ef4b827ff1dd680a1d04e99 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:15:02 +0100 Subject: remove manual config files --- config/demo.taler.net/taler.conf | 197 -------------------- .../demo.taler.net/taler/exchange/wire/test.json | 8 - config/demo.taler.net/taler/merchant/wire/fsf.json | 7 - .../demo.taler.net/taler/merchant/wire/gnunet.json | 7 - .../demo.taler.net/taler/merchant/wire/taler.json | 7 - config/demo.taler.net/taler/merchant/wire/tor.json | 7 - .../taler/merchant/wire/tutorial.json | 7 - config/test.taler.net/taler.conf | 198 --------------------- .../test.taler.net/taler/exchange/wire/test.json | 8 - config/test.taler.net/taler/merchant/wire/fsf.json | 7 - .../test.taler.net/taler/merchant/wire/gnunet.json | 7 - .../test.taler.net/taler/merchant/wire/taler.json | 7 - config/test.taler.net/taler/merchant/wire/tor.json | 7 - .../taler/merchant/wire/tutorial.json | 7 - 14 files changed, 481 deletions(-) delete mode 100644 config/demo.taler.net/taler.conf delete mode 100644 config/demo.taler.net/taler/exchange/wire/test.json delete mode 100644 config/demo.taler.net/taler/merchant/wire/fsf.json delete mode 100644 config/demo.taler.net/taler/merchant/wire/gnunet.json delete mode 100644 config/demo.taler.net/taler/merchant/wire/taler.json delete mode 100644 config/demo.taler.net/taler/merchant/wire/tor.json delete mode 100644 config/demo.taler.net/taler/merchant/wire/tutorial.json delete mode 100644 config/test.taler.net/taler.conf delete mode 100644 config/test.taler.net/taler/exchange/wire/test.json delete mode 100644 config/test.taler.net/taler/merchant/wire/fsf.json delete mode 100644 config/test.taler.net/taler/merchant/wire/gnunet.json delete mode 100644 config/test.taler.net/taler/merchant/wire/taler.json delete mode 100644 config/test.taler.net/taler/merchant/wire/tor.json delete mode 100644 config/test.taler.net/taler/merchant/wire/tutorial.json 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" -} -- cgit v1.2.3 From c0710cb119623266e80b6988c57b1f4e1723f2eb Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:19:03 +0100 Subject: add command overrides --- bin/taler-exchange-keyup | 4 ++++ bin/taler-generate-config | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 bin/taler-exchange-keyup create mode 100644 bin/taler-generate-config diff --git a/bin/taler-exchange-keyup b/bin/taler-exchange-keyup new file mode 100644 index 0000000..5118128 --- /dev/null +++ b/bin/taler-exchange-keyup @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +echo "Command disabled. Please use taler-deployment-keyup instead" +exit 1 diff --git a/bin/taler-generate-config b/bin/taler-generate-config new file mode 100644 index 0000000..ba7e3f2 --- /dev/null +++ b/bin/taler-generate-config @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +echo "Command disabled. Please use taler-deployment-config-generate instead" +exit 1 -- cgit v1.2.3 From 0fb0576e71cf8137f81ee3cc1bc5176995cf09e3 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:21:22 +0100 Subject: fix mode --- bin/taler-exchange-keyup | 0 bin/taler-generate-config | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/taler-exchange-keyup mode change 100644 => 100755 bin/taler-generate-config diff --git a/bin/taler-exchange-keyup b/bin/taler-exchange-keyup old mode 100644 new mode 100755 diff --git a/bin/taler-generate-config b/bin/taler-generate-config old mode 100644 new mode 100755 -- cgit v1.2.3 From 81700315466f1d77d7c4f4c9fc1fc5f8a05c03cf Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:21:50 +0100 Subject: fix path order --- bootstrap-bluegreen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index f898b5a..91d52e9 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -62,7 +62,7 @@ done cat >$HOME/activate < Date: Sat, 19 Nov 2016 19:24:12 +0100 Subject: only check out tag if repo new --- bootstrap-bluegreen | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 91d52e9..43bb994 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -40,14 +40,15 @@ esac cd $HOME -for component in gnunet libmicrohttpd; do - if ! test -d $HOME/$component; then - git clone git://gnunet.org/$component.git - fi -done +if ! test -d $HOME/gnunet; then + git clone git://gnunet.org/gnunet.git + git -C ~/gnunet checkout -q tags/taler-0.2.0 +fi -git -C ~/gnunet checkout -q tags/taler-0.2.0 -git -C ~/libmicrohttpd checkout -q tags/v0.9.52 +if ! test -d $HOME/libmicrohttpd; then + git clone git://gnunet.org/libmicrohttpd.git + git -C ~/libmicrohttpd checkout -q tags/v0.9.52 +fi for component in bank merchant gnurl landing exchange merchant-frontends deployment; do if ! test -d $HOME/$component; then -- cgit v1.2.3 From 429e39475b930fa4a6780dbab20200b6ffd8825c Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:25:20 +0100 Subject: rename --- bin/taler-generate-config | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 bin/taler-generate-config diff --git a/bin/taler-generate-config b/bin/taler-generate-config deleted file mode 100755 index ba7e3f2..0000000 --- a/bin/taler-generate-config +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -echo "Command disabled. Please use taler-deployment-config-generate instead" -exit 1 -- cgit v1.2.3 From a6a32c0ff5f5b29f268424e76c902e71aee31cc3 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:25:53 +0100 Subject: re-add --- bin/taler-config-generate | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 bin/taler-config-generate diff --git a/bin/taler-config-generate b/bin/taler-config-generate new file mode 100755 index 0000000..ba7e3f2 --- /dev/null +++ b/bin/taler-config-generate @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +echo "Command disabled. Please use taler-deployment-config-generate instead" +exit 1 -- cgit v1.2.3 From 95e3e45611a4ac8be3a74d09a8949b66f45f0b5c Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:29:43 +0100 Subject: fix typo --- config/generate-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/generate-config b/config/generate-config index 01cb734..f82db90 100755 --- a/config/generate-config +++ b/config/generate-config @@ -58,8 +58,8 @@ def config(currency, envname, exchange_pub): cfg_put("donations", "uwsgi_serve", "unix") cfg_put("donations", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") - cfg_put("blug", "uwsgi_serve", "unix") - cfg_put("blug", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") + cfg_put("blog", "uwsgi_serve", "unix") + cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") cfg_put("merchant", "WIREFORMAT", "test") -- cgit v1.2.3 From 5b46df5b14622a78d1386c504591dd3af8c90666 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:37:10 +0100 Subject: update conf gen --- config/generate-config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/generate-config b/config/generate-config index f82db90..5313583 100755 --- a/config/generate-config +++ b/config/generate-config @@ -60,6 +60,7 @@ def config(currency, envname, exchange_pub): cfg_put("blog", "uwsgi_serve", "unix") cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") + cfg_put("blog", "instance", "FSF") cfg_put("merchant", "WIREFORMAT", "test") @@ -73,6 +74,7 @@ def config(currency, envname, exchange_pub): cfg_put("merchant-exchange-test", "MASTER_KEY", exchange_pub) cfg_put("frontends", "BACKEND", "https://shop.{}.taler.net/backend/".format(envname)) + cfg_put("frontends", "FRACTION", "100000000") cfg_put("exchange", "serve", "unix") cfg_put("exchange", "unixpath", "$HOME/sockets/exchange.http") @@ -155,7 +157,7 @@ def main(currency, envname, outdir, exchange_pub): merchant_wf(envname, "gnunet", 4), merchant_wf(envname, "taler", 5), merchant_wf(envname, "tor", 3), - merchant_wf(envname, "test", 6), + merchant_wf(envname, "fsf", 6), ] exchange_wireformats = [ -- cgit v1.2.3 From 5f0b79688d1792bb2adb0f7394704e78d61cb29b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:44:25 +0100 Subject: update conf gen --- config/generate-config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/generate-config b/config/generate-config index 5313583..5956602 100755 --- a/config/generate-config +++ b/config/generate-config @@ -109,11 +109,13 @@ def config(currency, envname, exchange_pub): cfg_put("merchant-instance-Tor", "KEYFILE", "${TALER_DATA_HOME}/merchant/tor.priv") cfg_put("merchant-instance-GNUnet", "KEYFILE", "${TALER_DATA_HOME}/merchant/gnunet.priv") cfg_put("merchant-instance-Taler", "KEYFILE", "${TALER_DATA_HOME}/merchant/taler.priv") + cfg_put("merchant-instance-tutorial", "KEYFILE", "${TALER_DATA_HOME}/merchant/tutorial.priv") cfg_put("merchant-instance-wireformat-Tor", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tor.json") cfg_put("merchant-instance-wireformat-GNUnet", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/gnunet.json") cfg_put("merchant-instance-wireformat-Taler", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/taler.json") cfg_put("merchant-instance-wireformat-FSF", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/fsf.json") + cfg_put("merchant-instance-wireformat-tutorial", "TEST_RESPONSE_FILE", "${TALER_CONFIG_HOME}/merchant/wire/tutorial.json") coin(currency, "ct_10", "0.10") coin(currency, "1", "1") @@ -158,6 +160,7 @@ def main(currency, envname, outdir, exchange_pub): merchant_wf(envname, "taler", 5), merchant_wf(envname, "tor", 3), merchant_wf(envname, "fsf", 6), + merchant_wf(envname, "tutorial", 7), ] exchange_wireformats = [ -- cgit v1.2.3 From 285d241c3cbe3a7d7939c67022f41efabc681bc6 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:45:58 +0100 Subject: update conf gen --- config/generate-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/generate-config b/config/generate-config index 5956602..77ca390 100755 --- a/config/generate-config +++ b/config/generate-config @@ -68,7 +68,7 @@ def config(currency, envname, exchange_pub): cfg_put("merchant", "UNIXPATH", "$HOME/sockets/merchant.http") cfg_put("merchant", "WIRE_TRANSFER_DELAY", "1 m") - cfg_put("merchantdb-postgres", "CONFIG", "postgres:///taler") + cfg_put("merchantdb-postgres", "CONFIG", "postgres:///taler{}".format(envname)) cfg_put("merchant-exchange-test", "URI", "https://exchange.{}.taler.net/".format(envname)) cfg_put("merchant-exchange-test", "MASTER_KEY", exchange_pub) -- cgit v1.2.3 From 07ea1b0726cc9239b4612c3c5a35d54a3105b63f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:55:39 +0100 Subject: fix confgen --- config/generate-config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/generate-config b/config/generate-config index 77ca390..9c8916f 100755 --- a/config/generate-config +++ b/config/generate-config @@ -18,8 +18,8 @@ def cfg_write(file): file.write(key + " = " + value + "\n") file.write("\n") -def coin(name, - currency, +def coin(currency, + name, value, d_overlap="5 minutes", d_withdraw="32 years", @@ -31,7 +31,7 @@ def coin(name, f_refund="0.10", rsa_keysize="2048"): sec = "coin_"+currency+"_"+name - cfg_put(sec, "value", currency+":"+value) + cfg_put(sec, "value", ""+currency+":"+value) cfg_put(sec, "duration_overlap", d_overlap) cfg_put(sec, "duration_withdraw", d_withdraw) cfg_put(sec, "duration_spend", d_spend) -- cgit v1.2.3 From 1ec40cdf0514e9d7b068b53c26100df0bba3c591 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:57:08 +0100 Subject: fix confgen --- config/generate-config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/generate-config b/config/generate-config index 9c8916f..9c0198d 100755 --- a/config/generate-config +++ b/config/generate-config @@ -31,14 +31,14 @@ def coin(currency, f_refund="0.10", rsa_keysize="2048"): sec = "coin_"+currency+"_"+name - cfg_put(sec, "value", ""+currency+":"+value) + cfg_put(sec, "value", currency+":"+value) cfg_put(sec, "duration_overlap", d_overlap) cfg_put(sec, "duration_withdraw", d_withdraw) cfg_put(sec, "duration_spend", d_spend) cfg_put(sec, "duration_legal", d_legal) - cfg_put(sec, "fee_withdraw", f_withdraw) - cfg_put(sec, "fee_refresh", f_refresh) - cfg_put(sec, "fee_refund", f_refund) + cfg_put(sec, "fee_withdraw", currency+":"+f_withdraw) + cfg_put(sec, "fee_refresh", currency+":"+f_refresh) + cfg_put(sec, "fee_refund", currency+":"+f_refund) cfg_put(sec, "rsa_keysize", rsa_keysize) def config(currency, envname, exchange_pub): -- cgit v1.2.3 From c452c97931b2dd938c72801d3af72b7d653dca89 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 19:59:13 +0100 Subject: fix confgen --- config/generate-config | 1 + 1 file changed, 1 insertion(+) diff --git a/config/generate-config b/config/generate-config index 9c0198d..c9652d7 100755 --- a/config/generate-config +++ b/config/generate-config @@ -39,6 +39,7 @@ def coin(currency, cfg_put(sec, "fee_withdraw", currency+":"+f_withdraw) cfg_put(sec, "fee_refresh", currency+":"+f_refresh) cfg_put(sec, "fee_refund", currency+":"+f_refund) + cfg_put(sec, "fee_deposit", currency+":"+f_deposit) cfg_put(sec, "rsa_keysize", rsa_keysize) def config(currency, envname, exchange_pub): -- cgit v1.2.3 From 04b1addfd4d0247e661b796c3b11a435825c4596 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 20:04:38 +0100 Subject: add keyup --- bin/taler-deployment-keyup | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 bin/taler-deployment-keyup diff --git a/bin/taler-deployment-keyup b/bin/taler-deployment-keyup new file mode 100755 index 0000000..5a44bba --- /dev/null +++ b/bin/taler-deployment-keyup @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -eu + +~/local/bin/taler-exchange-keyup -m shared-data/exchange/offline-keys/master.priv + +chmod -fR g+rw shared-data -- cgit v1.2.3 From 7ca10a33c4a5cca81d93de188bc78389cde3632f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 20:18:21 +0100 Subject: fix fees --- config/generate-config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/generate-config b/config/generate-config index c9652d7..b7cca84 100755 --- a/config/generate-config +++ b/config/generate-config @@ -25,10 +25,10 @@ def coin(currency, d_withdraw="32 years", d_spend="5 years", d_legal="10 years", - f_withdraw="0.10", - f_deposit="0.10", - f_refresh="0.10", - f_refund="0.10", + f_withdraw="0.01", + f_deposit="0.01", + f_refresh="0.01", + f_refund="0.01", rsa_keysize="2048"): sec = "coin_"+currency+"_"+name cfg_put(sec, "value", currency+":"+value) -- cgit v1.2.3 From 317b67f7a19e8112cd75f4d4e80447f976125860 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 20:49:46 +0100 Subject: fix conf --- config/generate-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/generate-config b/config/generate-config index b7cca84..d61e7c1 100755 --- a/config/generate-config +++ b/config/generate-config @@ -44,6 +44,7 @@ def coin(currency, def config(currency, envname, exchange_pub): cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data") + cfg_put("paths", "TALER_DEPLOYMENT_SHARED", "${HOME}/shared-data") cfg_put("taler", "CURRENCY", currency) @@ -82,6 +83,7 @@ def config(currency, envname, exchange_pub): cfg_put("exchange", "master_public_key", exchange_pub) cfg_put("exchange", "wireformat", "test") + cfg_put("exchange", "MASTER_PRIV_FILE", "${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv") cfg_put("exchange", "keydir", "${TALER_DEPLOYMENT_SHARED}/exchange/live-keys/") cfg_put("exchange-admin", "SERVE", "unix") -- cgit v1.2.3 From 48e3a80c3605f74071285096d055c5541869e75f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 19 Nov 2016 22:21:54 +0100 Subject: disable commands in a way that doesn't interfere with tests --- bin/taler-config-generate | 4 ---- bin/taler-exchange-keyup | 4 ---- bootstrap-bluegreen | 10 ++++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100755 bin/taler-config-generate delete mode 100755 bin/taler-exchange-keyup diff --git a/bin/taler-config-generate b/bin/taler-config-generate deleted file mode 100755 index ba7e3f2..0000000 --- a/bin/taler-config-generate +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -echo "Command disabled. Please use taler-deployment-config-generate instead" -exit 1 diff --git a/bin/taler-exchange-keyup b/bin/taler-exchange-keyup deleted file mode 100755 index 5118128..0000000 --- a/bin/taler-exchange-keyup +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -echo "Command disabled. Please use taler-deployment-keyup instead" -exit 1 diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 43bb994..8635f02 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -63,6 +63,16 @@ done cat >$HOME/activate < Date: Sun, 20 Nov 2016 04:34:43 +0100 Subject: demo redirects --- etc/nginx/conf.d/demo.redirects | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/nginx/conf.d/demo.redirects b/etc/nginx/conf.d/demo.redirects index b81800d..a65172f 100644 --- a/etc/nginx/conf.d/demo.redirects +++ b/etc/nginx/conf.d/demo.redirects @@ -1,7 +1,7 @@ - rewrite ^/shop$ $scheme://shop.demo.taler.net/ redirect; - rewrite ^/blog$ $scheme://blog.demo.taler.net/ redirect; - rewrite ^/landing$ $scheme://demo.taler.net/ redirect; - rewrite ^/bank(.*)$ $scheme://bank.demo.taler.net/$1 redirect; - rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect; - rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; - rewrite ^/blog/track$ $scheme://blog.demo.taler.net/track redirect; +rewrite ^/shop$ $scheme://shop.demo.taler.net/ redirect; +rewrite ^/donations$ $scheme://donations.demo.taler.net/ redirect; +rewrite ^/landing$ $scheme://demo.taler.net/ redirect; +rewrite ^/bank(.*)$ $scheme://bank.demo.taler.net/$1 redirect; +rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect; +rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; +rewrite ^/blog/track$ $scheme://blog.demo.taler.net/track redirect; -- cgit v1.2.3 From 8b63ffcafaaf8384fc8c21ea45e0cad0491e309e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 20 Nov 2016 04:38:30 +0100 Subject: blog->shop for test --- etc/nginx/conf.d/test.redirects | 14 +++++++------- etc/nginx/sites-enabled/test.site | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/etc/nginx/conf.d/test.redirects b/etc/nginx/conf.d/test.redirects index e432ee6..af56520 100644 --- a/etc/nginx/conf.d/test.redirects +++ b/etc/nginx/conf.d/test.redirects @@ -1,7 +1,7 @@ - rewrite ^/shop$ $scheme://shop.test.taler.net/ redirect; - rewrite ^/blog$ $scheme://blog.test.taler.net/ redirect; - rewrite ^/landing$ $scheme://test.taler.net/ redirect; - rewrite ^/bank(.*)$ $scheme://bank.test.taler.net/$1 redirect; - rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect; - rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; - rewrite ^/blog/track$ $scheme://blog.test.taler.net/track redirect; +rewrite ^/shop$ $scheme://shop.test.taler.net/ redirect; +rewrite ^/donations$ $scheme://donations.test.taler.net/ redirect; +rewrite ^/landing$ $scheme://test.taler.net/ redirect; +rewrite ^/bank(.*)$ $scheme://bank.test.taler.net/$1 redirect; +rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect; +rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; +rewrite ^/blog/track$ $scheme://blog.test.taler.net/track redirect; diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site index 67ae5af..ea193cf 100644 --- a/etc/nginx/sites-enabled/test.site +++ b/etc/nginx/sites-enabled/test.site @@ -3,7 +3,6 @@ server { listen [::]:80; server_name test.taler.net bank.test.taler.net - blog.test.taler.net shop.test.taler.net exchange.test.taler.net; rewrite ^ https://$host$request_uri? permanent; @@ -51,7 +50,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - server_name blog.test.taler.net; + server_name shop.test.taler.net; root /dev/null; include conf.d/test.redirects; include conf.d/talerssl; @@ -91,7 +90,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - server_name shop.test.taler.net; + server_name donations.test.taler.net; ssi on; include conf.d/test.redirects; include conf.d/talerssl; -- cgit v1.2.3 From b883e19ebb1372a6448819a52112091cb10fe60a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 20 Nov 2016 04:40:50 +0100 Subject: conf gen --- config/generate-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/generate-config b/config/generate-config index d61e7c1..da6a236 100755 --- a/config/generate-config +++ b/config/generate-config @@ -61,7 +61,7 @@ def config(currency, envname, exchange_pub): cfg_put("donations", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") cfg_put("blog", "uwsgi_serve", "unix") - cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/donations.uwsgi") + cfg_put("blog", "uwsgi_unixpath", "$HOME/sockets/shop.uwsgi") cfg_put("blog", "instance", "FSF") -- cgit v1.2.3 From 4f37fe74a24698bcf489f614bb97797a3dbd2694 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 20 Nov 2016 04:45:56 +0100 Subject: nginx --- etc/nginx/sites-enabled/test.site | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site index ea193cf..e7d829b 100644 --- a/etc/nginx/sites-enabled/test.site +++ b/etc/nginx/sites-enabled/test.site @@ -57,7 +57,7 @@ server { ssi on; location / { - uwsgi_pass unix:/home/test/sockets/blog.uwsgi; + uwsgi_pass unix:/home/test/sockets/shop.uwsgi; include /etc/nginx/uwsgi_params; } -- cgit v1.2.3 From 0ae67e9d6f06098cddfe3d7b133e75def5899f55 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 20 Nov 2016 04:47:31 +0100 Subject: nginx: blog->shop --- etc/nginx/sites-enabled/demo.site | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site index c027648..98f238f 100644 --- a/etc/nginx/sites-enabled/demo.site +++ b/etc/nginx/sites-enabled/demo.site @@ -4,7 +4,6 @@ server { server_name demo.taler.net bank.demo.taler.net shop.demo.taler.net - blog.demo.taler.net exchange.demo.taler.net; rewrite ^ https://$host$request_uri? permanent; @@ -68,14 +67,14 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - server_name blog.demo.taler.net; + server_name shop.demo.taler.net; root /dev/null; include conf.d/demo.redirects; include conf.d/talerssl; ssi on; location / { - uwsgi_pass unix:/home/demo/sockets/blog.uwsgi; + uwsgi_pass unix:/home/demo/sockets/shop.uwsgi; include /etc/nginx/uwsgi_params; } @@ -93,7 +92,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - server_name shop.demo.taler.net; + server_name donations.demo.taler.net; ssi on; include conf.d/demo.redirects; include conf.d/talerssl; -- cgit v1.2.3 From 3cd0fd23bf80dabddd736c8ba93187521c24d478 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 21 Nov 2016 14:51:40 +0100 Subject: preparations for standalone envs --- bootstrap-standalone | 57 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/bootstrap-standalone b/bootstrap-standalone index 620c392..e76f50a 100755 --- a/bootstrap-standalone +++ b/bootstrap-standalone @@ -1,33 +1,58 @@ #!/bin/bash -# Bootstrap a standalone Taler installation from source, -# on one single user account, without blue/green deployment. +# Bootstrap the Taler setup for the user account that +# is currently logged in. -set -eu +# Generates a setup for a single user, +# including a postgresql DB. -base=$HOME +set -eu -mkdir -p $base +ENVNAME=$USER -cd $base +cd $HOME -if ! test -d $base/gnunet; then - svn checkout https://gnunet.org/svn/gnunet +if ! test -d $HOME/gnunet; then + git clone git://gnunet.org/gnunet.git + git -C ~/gnunet checkout -q tags/taler-0.2.0 fi -if ! test -d $base/libmicrohttpd; then - svn checkout https://gnunet.org/svn/libmicrohttpd +if ! test -d $HOME/libmicrohttpd; then + git clone git://gnunet.org/libmicrohttpd.git + git -C ~/libmicrohttpd checkout -q tags/v0.9.52 fi for component in bank merchant gnurl landing exchange merchant-frontends deployment; do - if ! test -d $base/$component; then - git clone git://taler.net/$component + if ! test -d $HOME/$component; then + git clone /var/git/$component.git fi done -cat >$base/activate <$HOME/activate < Date: Mon, 21 Nov 2016 14:52:33 +0100 Subject: preparations for standalone envs --- bootstrap-standalone | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-standalone b/bootstrap-standalone index e76f50a..95631f3 100755 --- a/bootstrap-standalone +++ b/bootstrap-standalone @@ -9,6 +9,7 @@ set -eu ENVNAME=$USER +BRANCE=master cd $HOME -- cgit v1.2.3 From 4d9baa5f90ae86fbdea63ae0657a4f8344ba3698 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 21 Nov 2016 14:52:55 +0100 Subject: preparations for standalone envs --- bootstrap-standalone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-standalone b/bootstrap-standalone index 95631f3..d868389 100755 --- a/bootstrap-standalone +++ b/bootstrap-standalone @@ -9,7 +9,7 @@ set -eu ENVNAME=$USER -BRANCE=master +BRANCH=master cd $HOME -- cgit v1.2.3 From 87206458adf4ada8f515828262dbbb41aba7179c Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 21 Nov 2016 14:55:05 +0100 Subject: standalone currency --- bootstrap-standalone | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-standalone b/bootstrap-standalone index d868389..f108c72 100755 --- a/bootstrap-standalone +++ b/bootstrap-standalone @@ -10,6 +10,7 @@ set -eu ENVNAME=$USER BRANCH=master +CURRENCY=$(echo "*KUDOS-$USER" | cut -c 1-13) cd $HOME -- cgit v1.2.3 From d9fe32257e1dfe5ddca4bc3cc3422f09b0eb62e4 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 21 Nov 2016 15:32:19 +0100 Subject: db creation --- bootstrap-standalone | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap-standalone b/bootstrap-standalone index f108c72..1d44dce 100755 --- a/bootstrap-standalone +++ b/bootstrap-standalone @@ -41,6 +41,11 @@ fi mkdir -p $HOME/sockets +/usr/lib/postgresql/9.5/bin/postgres --single -D ~/talerdb -k $HOME/sockets -h "" postgres \ + >/dev/null <<< "create database taler" +/usr/lib/postgresql/9.5/bin/postgres --single -D ~/talerdb -k $HOME/sockets -h "" postgres \ + >/dev/null <<< "create database talercheck" + cat >$HOME/activate < Date: Mon, 21 Nov 2016 15:34:15 +0100 Subject: add arm postgres --- taler-arm/taler-postgres-standalone.conf | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 taler-arm/taler-postgres-standalone.conf diff --git a/taler-arm/taler-postgres-standalone.conf b/taler-arm/taler-postgres-standalone.conf new file mode 100644 index 0000000..d1e1da8 --- /dev/null +++ b/taler-arm/taler-postgres-standalone.conf @@ -0,0 +1,4 @@ +[taler-postgres-standalone] +TYPE = simple +BINARY = /usr/lib/postgresql/9.5/bin/postgres +OPTIONS = -D $HOME/talerdb -k $HOME/sockets -h "" -- cgit v1.2.3