diff options
-rw-r--r-- | README.md | 15 | ||||
-rwxr-xr-x | bin/taler-deployment-arm | 4 | ||||
-rwxr-xr-x | bin/taler-deployment-restart | 2 | ||||
-rwxr-xr-x | bin/taler-deployment-start | 2 | ||||
-rwxr-xr-x | bootstrap-demo | 10 | ||||
-rwxr-xr-x | bootstrap-test | 10 | ||||
-rw-r--r-- | config/demo.taler.net/taler.conf | 110 | ||||
-rw-r--r-- | config/test.taler.net/taler.conf | 36 | ||||
-rw-r--r-- | taler-arm/defaults.conf | 4 | ||||
-rw-r--r-- | taler-arm/taler-blog.conf | 2 | ||||
-rw-r--r-- | taler-arm/taler-demobank.conf | 2 | ||||
-rw-r--r-- | taler-arm/taler-donations.conf | 2 | ||||
-rw-r--r-- | taler-arm/taler-exchange.conf | 1 | ||||
-rw-r--r-- | taler-arm/taler-merchant.conf | 2 | ||||
-rwxr-xr-x | taler-build/invalidate.sh | 10 | ||||
-rwxr-xr-x | taler-build/update_bank.sh | 21 | ||||
-rwxr-xr-x | taler-build/update_exchange.sh | 16 | ||||
-rwxr-xr-x | taler-build/update_gnunet.sh | 16 | ||||
-rwxr-xr-x | taler-build/update_landing.sh | 2 | ||||
-rwxr-xr-x | taler-build/update_libgnurl.sh | 11 | ||||
-rwxr-xr-x | taler-build/update_libmicrohttpd.sh | 16 | ||||
-rwxr-xr-x | taler-build/update_merchant.sh | 38 | ||||
-rwxr-xr-x | taler-build/update_merchant_frontends.sh | 21 |
23 files changed, 173 insertions, 180 deletions
diff --git a/README.md b/README.md new file mode 100644 index 0000000..f90f0f9 --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +Deployment Layout +================= + +top-level +--------- + +`green.*.taler.net`: the green instance +`blue.*.taler.net`: the blue instance +`shared-data`: static data shared between instances, such as private keys +`sockets`: directory with sockets of the active deployment, usually a symlink +to either the blue or green socket folder + + + + diff --git a/bin/taler-deployment-arm b/bin/taler-deployment-arm index 1b30523..4624b31 100755 --- a/bin/taler-deployment-arm +++ b/bin/taler-deployment-arm @@ -1,8 +1,6 @@ #!/bin/bash -# Deployment color (for green-blue deployments) -# For colorless deployments, it's set to "." -base=${TALER_DEPLOYMENT_BASE:-$HOME} +base=$HOME logdir=$base/logs diff --git a/bin/taler-deployment-restart b/bin/taler-deployment-restart index 905c4d6..4ab1ba0 100755 --- a/bin/taler-deployment-restart +++ b/bin/taler-deployment-restart @@ -1,6 +1,6 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} +base=$HOME export PATH="$base/deployment":$PATH diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start index 6167df7..1290dcd 100755 --- a/bin/taler-deployment-start +++ b/bin/taler-deployment-start @@ -1,6 +1,6 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} +base=$HOME export PATH="$base/deployment":$PATH diff --git a/bootstrap-demo b/bootstrap-demo index f31a31a..c7896ac 100755 --- a/bootstrap-demo +++ b/bootstrap-demo @@ -2,7 +2,7 @@ set -eu -base=${TALER_DEPLOYMENT_BASE:?not set} +base=$HOME mkdir -p $base @@ -28,12 +28,10 @@ done cat >$base/activate <<EOL #!/bin/bash -export TALER_DEPLOYMENT_BASE=$base -export TALER_PREFIX=$base/local export PATH="$base/local/bin:$base/deployment/bin:\$PATH" EOL -mkdir -p $base/config -ln -sft $base/config $base/deployment/config/demo.taler.net/taler.conf -ln -sft $base/config $base/deployment/config/demo.taler.net/taler +mkdir -p $base/.config +ln -sft $base/.config $base/deployment/config/demo.taler.net/taler.conf +ln -sft $base/.config $base/deployment/config/demo.taler.net/taler diff --git a/bootstrap-test b/bootstrap-test index 035b479..e479180 100755 --- a/bootstrap-test +++ b/bootstrap-test @@ -2,7 +2,7 @@ set -eu -base=${TALER_DEPLOYMENT_BASE:?not set} +base=$HOME mkdir -p $base @@ -24,12 +24,10 @@ done cat >$base/activate <<EOL #!/bin/bash -export TALER_DEPLOYMENT_BASE=$base -export TALER_PREFIX=$base/local export PATH="$base/local/bin:$base/deployment/bin:\$PATH" EOL -mkdir -p $base/config -ln -sft "$base/config" "$base/deployment/config/test.taler.net/taler.conf" -ln -sft "$base/config" "$base/deployment/config/test.taler.net/taler" +mkdir -p $base/.config +ln -sft "$base/.config" "$base/deployment/config/test.taler.net/taler.conf" +ln -sft "$base/.config" "$base/deployment/config/test.taler.net/taler" diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf index d946231..ee418de 100644 --- a/config/demo.taler.net/taler.conf +++ b/config/demo.taler.net/taler.conf @@ -1,59 +1,67 @@ [paths] -TALER_CONFIG_HOME = ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler -# data that is shared across all deployments on e.g. one account TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data + [taler] -CURRENCY = KUDOS +CURRENCY = PUDOS + [bank] uwsgi_serve = unix -uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/bank.uwsgi -database = talerdemo +uwsgi_unixpath = $HOME/sockets/bank.uwsgi +database = talerbank + [donations] uwsgi_serve = unix -uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/donations.uwsgi +uwsgi_unixpath = $HOME/sockets/donations.uwsgi + [blog] uwsgi_serve = unix -uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/blog.uwsgi +uwsgi_unixpath = $HOME/sockets/blog.uwsgi + [merchant] WIREFORMAT = test SERVE = unix -UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/merchant.http +UNIXPATH = $HOME/sockets/merchant.http KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv +EDATE = 3 week -[merchant-wireformat] -BANK_URI = https://bank.demo.taler.net/ -BANK_ACCOUNT_NUMBER = 3 -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json [merchantdb-postgres] -CONFIG = postgres:///talerdemo +CONFIG = postgres:///talertest + [merchant-exchange-test] -URI = https://exchange.demo.taler.net/ +URI = https://exchange.test.taler.net/ MASTER_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00 + +[frontends] +BACKEND = https://shop.test.taler.net/backend/ + + [exchange] SERVE = unix -UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/exchange.http -KEYDIR = ${TALER_DEPLOYMENT_SHARED:-$HOME}/exchange/live-keys/ +UNIXPATH = $HOME/sockets/exchange.http MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00 WIREFORMAT = test TESTRUN = YES + [exchangedb-postgres] -DB_CONN_STR = "postgres:///talerdemo" +DB_CONN_STR = "postgres:///talertest" + [exchange-wire-outgoing-test] -BANK_URI = https://bank.demo.taler.net/ +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 @@ -69,82 +77,84 @@ lookahead_sign = 32 weeks 1 day # ahead of time? lookahead_provide = 4 weeks 1 day -[merchant] -EDATE = 3 week # Coin definitions are detected because the section # name begins with "coin_". The rest of the # name is free, but of course following the convention # of "coin_$CURRENCY[_$SUBUNIT]_$VALUE" make sense. [coin_pudos_ct_10] -value = KUDOS:0.10 +value = PUDOS: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 +fee_withdraw = PUDOS:0.01 +fee_deposit = PUDOS:0.01 +fee_refresh = PUDOS:0.01 +fee_refund = PUDOS:0.01 rsa_keysize = 1024 [coin_pudos_1] -value = KUDOS:1 +value = PUDOS: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 +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 = KUDOS:2 +value = PUDOS: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 +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 = KUDOS:5 +value = PUDOS: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 +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 = KUDOS:10 +value = PUDOS: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 +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 = KUDOS:1000 +value = PUDOS: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 +fee_withdraw = PUDOS:0.01 +fee_deposit = PUDOS:0.01 +fee_refresh = PUDOS:0.01 +fee_refund = PUDOS:0.01 rsa_keysize = 2048 diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf index 5e4e33a..ee418de 100644 --- a/config/test.taler.net/taler.conf +++ b/config/test.taler.net/taler.conf @@ -1,65 +1,67 @@ [paths] -TALER_CONFIG_HOME = ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler -# data that is shared across all deployments on e.g. one account TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data + [taler] CURRENCY = PUDOS + [bank] uwsgi_serve = unix -uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/bank.uwsgi +uwsgi_unixpath = $HOME/sockets/bank.uwsgi database = talerbank [donations] uwsgi_serve = unix -uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/donations.uwsgi +uwsgi_unixpath = $HOME/sockets/donations.uwsgi + [blog] uwsgi_serve = unix -uwsgi_unixpath = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/blog.uwsgi +uwsgi_unixpath = $HOME/sockets/blog.uwsgi + [merchant] WIREFORMAT = test SERVE = unix -UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/merchant.http +UNIXPATH = $HOME/sockets/merchant.http KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv +EDATE = 3 week -[merchant-wireformat] -BANK_URI = https://bank.test.taler.net/ -BANK_ACCOUNT_NUMBER = 3 -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/test.json [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/ + [exchange] SERVE = unix -UNIXPATH = ${TALER_DEPLOYMENT_BASE:-$HOME}/sockets/exchange.http - -KEYDIR = ${TALER_DEPLOYMENT_SHARED:-$HOME}/exchange/live-keys/ +UNIXPATH = $HOME/sockets/exchange.http MASTER_PRIV_FILE = ${TALER_DEPLOYMENT_SHARED}/exchange/offline-keys/master.priv - MASTER_PUBLIC_KEY = CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00 WIREFORMAT = test TESTRUN = YES + [exchangedb-postgres] DB_CONN_STR = "postgres:///talertest" + [exchange-wire-outgoing-test] BANK_URI = https://bank.test.taler.net/ BANK_ACCOUNT_NUMBER = 1 EXCHANGE_ACCOUNT_NUMBER = 2 + [exchange_keys] # how long is one signkey valid? signkey_duration = 18 weeks @@ -75,8 +77,6 @@ lookahead_sign = 32 weeks 1 day # ahead of time? lookahead_provide = 4 weeks 1 day -[merchant] -EDATE = 3 week # Coin definitions are detected because the section # name begins with "coin_". The rest of the @@ -107,6 +107,7 @@ fee_refresh = PUDOS:0.01 fee_refund = PUDOS:0.01 rsa_keysize = 1024 + [coin_pudos_2] value = PUDOS:2 duration_overlap = 5 minutes @@ -119,6 +120,7 @@ fee_refresh = PUDOS:0.01 fee_refund = PUDOS:0.01 rsa_keysize = 1024 + [coin_pudos_5] value = PUDOS:5 duration_overlap = 5 minutes @@ -131,6 +133,7 @@ fee_refresh = PUDOS:0.01 fee_refund = PUDOS:0.01 rsa_keysize = 1024 + [coin_pudos_10] value = PUDOS:10 duration_overlap = 5 minutes @@ -143,6 +146,7 @@ fee_refresh = PUDOS:0.01 fee_refund = PUDOS:0.01 rsa_keysize = 1024 + [coin_pudos_1000] value = PUDOS:1000 duration_overlap = 5 minutes diff --git a/taler-arm/defaults.conf b/taler-arm/defaults.conf index ec2c267..c4f28c3 100644 --- a/taler-arm/defaults.conf +++ b/taler-arm/defaults.conf @@ -10,7 +10,7 @@ GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-$GNUNET_HOME/.config}/gnunet/ # Cached data, no big deal if lost GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/ -GNUNET_RUNTIME_DIR = ${TALER_DEPLOYMENT_BASE}/run/gnunet-system-runtime +GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/ # Runtime data for per-user services -GNUNET_USER_RUNTIME_DIR = ${TALER_DEPLOYMENT_BASE}/run/gnunet-${USERHOME:-${USER:-user}}-runtime/ +GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/ diff --git a/taler-arm/taler-blog.conf b/taler-arm/taler-blog.conf index b3e6992..3a42093 100644 --- a/taler-arm/taler-blog.conf +++ b/taler-arm/taler-blog.conf @@ -1,4 +1,4 @@ [taler-blog] TYPE = simple BINARY = taler-merchant-blog -OPTIONS = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf serve-uwsgi +OPTIONS = serve-uwsgi diff --git a/taler-arm/taler-demobank.conf b/taler-arm/taler-demobank.conf index 62e8921..be61219 100644 --- a/taler-arm/taler-demobank.conf +++ b/taler-arm/taler-demobank.conf @@ -1,4 +1,4 @@ [taler-demobank] TYPE = simple BINARY = taler-bank-manage -OPTIONS = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf serve-uwsgi +OPTIONS = serve-uwsgi diff --git a/taler-arm/taler-donations.conf b/taler-arm/taler-donations.conf index d9727c8..e3588ec 100644 --- a/taler-arm/taler-donations.conf +++ b/taler-arm/taler-donations.conf @@ -1,4 +1,4 @@ [taler-donations] TYPE = simple BINARY = taler-merchant-donations -OPTIONS = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf serve-uwsgi +OPTIONS = serve-uwsgi diff --git a/taler-arm/taler-exchange.conf b/taler-arm/taler-exchange.conf index 24a528f..3bbebde 100644 --- a/taler-arm/taler-exchange.conf +++ b/taler-arm/taler-exchange.conf @@ -1,4 +1,3 @@ [taler-exchange] TYPE = simple BINARY = taler-exchange-httpd -OPTIONS = -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf diff --git a/taler-arm/taler-merchant.conf b/taler-arm/taler-merchant.conf index 3b1c876..70318c6 100644 --- a/taler-arm/taler-merchant.conf +++ b/taler-arm/taler-merchant.conf @@ -1,4 +1,4 @@ [taler-merchant] TYPE = simple BINARY = taler-merchant-httpd -OPTIONS = -t -c ${TALER_DEPLOYMENT_BASE:-$HOME}/config/taler.conf +OPTIONS = -t diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh index 13c8c8e..7f77863 100755 --- a/taler-build/invalidate.sh +++ b/taler-build/invalidate.sh @@ -8,23 +8,21 @@ set -eu -base=${TALER_DEPLOYMENT_BASE:-$HOME} - for component in exchange merchant bank gnurl merchant-frontends landing; do - cd $base/$component + cd $HOME/$component git fetch if git status -sb | grep behind; then echo "invalidating $component" - rm -f $base/deployment/taler-build/$component-stamp + rm -f $HOME/deployment/taler-build/$component-stamp fi done for component in gnunet libmicrohttpd; do - cd $base/$component + 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 $base/deployment/taler-build/$component-stamp + rm -f $HOME/deployment/taler-build/$component-stamp fi done diff --git a/taler-build/update_bank.sh b/taler-build/update_bank.sh index 2eff9c9..43056db 100755 --- a/taler-build/update_bank.sh +++ b/taler-build/update_bank.sh @@ -1,15 +1,12 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} +set -eu -export PATH="$base/deployment":$PATH - -cd $base/bank/ && \ - git pull && \ - git submodule update --init && \ - git clean -fxd && \ - ./bootstrap && \ - ./configure --prefix="$base/local" && \ - make && \ - make install && \ - cd $base/deployment +cd $base/bank/ +git pull +git submodule update --init +git clean -fxd +./bootstrap +./configure --prefix="$base/local" +make +make install diff --git a/taler-build/update_exchange.sh b/taler-build/update_exchange.sh index 9d3fed3..1e96119 100755 --- a/taler-build/update_exchange.sh +++ b/taler-build/update_exchange.sh @@ -1,27 +1,25 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} -export PATH="$base/deployment":$PATH +export PATH="$HOME/deployment":$PATH build_exchange() { ( set -eu - base=${TALER_DEPLOYMENT_BASE:-$HOME} - cd $base/exchange + cd $HOME/exchange git clean -fdx ./bootstrap ./configure CFLAGS='-ggdb -O0' \ - --with-libgnurl=$base/local \ - --with-microhttpd=$base/local \ - --prefix=$base/local --with-gnunet=$base/local \ + --with-libgnurl=$HOME/local \ + --with-microhttpd=$HOME/local \ + --prefix=$HOME/local --with-gnunet=$HOME/local \ --enable-logging=verbose make make install ) } -cd $base/exchange && \ +cd $HOME/exchange && \ git pull && \ - cd $base/deployment && \ + cd $HOME/deployment && \ build_exchange diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh index 019623f..c2201ba 100755 --- a/taler-build/update_gnunet.sh +++ b/taler-build/update_gnunet.sh @@ -1,11 +1,11 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} +set -eu -cd $base/gnunet/ && \ - svn revert -R . && \ - svn update && \ - ./bootstrap && \ - ./configure --prefix=$base/local --enable-logging=verbose --with-libgnurl=$base/local --with-microhttps=$base/local && \ - make && \ - make install +cd $HOME/gnunet/ +svn revert -R . +svn update +./bootstrap +./configure --prefix=$HOME/local --enable-logging=verbose --with-libgnurl=$HOME/local --with-microhttps=$HOME/local +make +make install diff --git a/taler-build/update_landing.sh b/taler-build/update_landing.sh index 253b05f..c75166c 100755 --- a/taler-build/update_landing.sh +++ b/taler-build/update_landing.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -base=${TALER_DEPLOYMENT_BASE:-$HOME} +base=$HOME cd $base/landing git pull diff --git a/taler-build/update_libgnurl.sh b/taler-build/update_libgnurl.sh index 738bc8e..2860fec 100755 --- a/taler-build/update_libgnurl.sh +++ b/taler-build/update_libgnurl.sh @@ -1,22 +1,17 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} -export PATH="$base/deployment":$PATH - build_gnurl() { ( set -eu - base=${TALER_DEPLOYMENT_BASE:-$HOME} - - cd $base/gnurl + cd $HOME/gnurl git clean -fdx ./buildconf - ./configure --enable-ipv6 --with-gnutls --without-libssh2 --without-libmetalink --without-winidn --without-librtmp --without-nghttp2 --without-nss --without-cyassl --without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-file --disable-ftp --disable-smb --prefix=$base/local + ./configure --enable-ipv6 --with-gnutls --without-libssh2 --without-libmetalink --without-winidn --without-librtmp --without-nghttp2 --without-nss --without-cyassl --without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-file --disable-ftp --disable-smb --prefix=$HOME/local make make install ) } -cd $base/gnurl/ && \ +cd $HOME/gnurl/ && \ git pull && \ build_gnurl diff --git a/taler-build/update_libmicrohttpd.sh b/taler-build/update_libmicrohttpd.sh index 40b6bea..ba90b25 100755 --- a/taler-build/update_libmicrohttpd.sh +++ b/taler-build/update_libmicrohttpd.sh @@ -1,11 +1,9 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} - -cd $base/libmicrohttpd/ && \ - svn revert -R . && \ - svn update && \ - ./bootstrap && \ - ./configure --prefix=$base/local && \ - make && \ - make install +cd $HOME/libmicrohttpd/ +svn revert -R . +svn update +./bootstrap +./configure --prefix=$HOME/local +make +make install diff --git a/taler-build/update_merchant.sh b/taler-build/update_merchant.sh index bda4290..fab648f 100755 --- a/taler-build/update_merchant.sh +++ b/taler-build/update_merchant.sh @@ -1,28 +1,16 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} -export PATH="$base/deployment":$PATH +set -eu -build_merchant() { - ( - set -eu - base=${TALER_DEPLOYMENT_BASE:-$HOME} - - cd $base/merchant - git clean -fdx - ./bootstrap - ./configure CFLAGS='-ggdb -O0' \ - --prefix=$base/local --with-gnunet=$base/local \ - --with-mint=$base/local \ - --with-microhttpd=$base/local \ - --enable-logging=verbose - make - make install - ) -} - -cd $base/merchant/ && \ - git pull && \ - git submodule update --init && \ - cd $base/deployment && \ - build_merchant +cd $HOME/merchant/ +git pull +git submodule update --init +git clean -fdx +./bootstrap +./configure CFLAGS='-ggdb -O0' \ + --prefix=$HOME/local --with-gnunet=$HOME/local \ + --with-mint=$HOME/local \ + --with-microhttpd=$HOME/local \ + --enable-logging=verbose +make +make install diff --git a/taler-build/update_merchant_frontends.sh b/taler-build/update_merchant_frontends.sh index 3e206c9..0a948ab 100755 --- a/taler-build/update_merchant_frontends.sh +++ b/taler-build/update_merchant_frontends.sh @@ -1,15 +1,12 @@ #!/bin/bash -base=${TALER_DEPLOYMENT_BASE:-$HOME} +set -eu -export PATH="$base/deployment":$PATH - -cd $base/merchant-frontends/ && \ - git pull && \ - git submodule update --init && \ - git clean -fxd && \ - ./bootstrap && \ - ./configure --prefix="$base/local" && \ - make && \ - make install && \ - cd $base/deployment +cd $HOME/merchant-frontends/ +git pull +git submodule update --init +git clean -fxd +./bootstrap +./configure --prefix="$HOME/local" +make +make install |