Mercurial > hg > anonet-resdb
changeset 853:d7e331a9a1f8 draft
Merge commit '68d573ca1cc4d91b180a80807342beeca90b1ea1'
author | Nick <nick@somerandomnick.ano> |
---|---|
date | Tue, 27 Dec 2011 19:45:09 +0000 |
parents | 2fa4790fa684 (diff) 084fe9662481 (current diff) |
children | d3e491fe9e89 |
files | |
diffstat | 4 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/peer2anonet/peer2anonet Tue Dec 27 19:39:31 2011 +0000 +++ b/contrib/peer2anonet/peer2anonet Tue Dec 27 19:45:09 2011 +0000 @@ -413,14 +413,14 @@ ) echo -e '\nCONFIGURE DNS:\n' - NICK=`cat conf/git_name` - TINYDNS_ROOT_IP=`cat conf/tinydns__rootsrvrip` - TINYDNS_ROOT_DOMAIN=`cat conf/tinydns__rootsrvrname` - TINYDNS_ANO_IP=`cat conf/tinydns__tldsrvrip` - TINYDNS_ANO_DOMAIN=`cat conf/tinydns__tldsrvrname` - TINYDNS_IP=`cat conf/tinydns__srvrip` - TINYDNS_DOMAIN=`cat conf/tinydns__srvrname` - GIT_IP=`cat conf/gitd_ip` + NICK=`cat conf/git_name` || exit 1 + TINYDNS_ROOT_IP=`cat conf/tinydns__rootsrvrip` || exit 1 + TINYDNS_ROOT_DOMAIN=`cat conf/tinydns__rootsrvrname` || exit 1 + TINYDNS_ANO_IP=`cat conf/tinydns__tldsrvrip` || exit 1 + TINYDNS_ANO_DOMAIN=`cat conf/tinydns__tldsrvrname` || exit 1 + TINYDNS_IP=`cat conf/tinydns__srvrip` || exit 1 + TINYDNS_DOMAIN=`cat conf/tinydns__srvrname` || exit 1 + GIT_IP=`cat conf/gitd_ip` || exit 1 GIT_DOMAIN="git.$NICK.ano" ip addr add $TINYDNS_ROOT_IP/32 dev lo > /dev/null 2>&1
--- a/contrib/splicex/configure Tue Dec 27 19:39:31 2011 +0000 +++ b/contrib/splicex/configure Tue Dec 27 19:45:09 2011 +0000 @@ -74,6 +74,7 @@ fi fi echo +mkdir -p build || exit 1 if [ -z "$2" ]; then sed -e s^PYTHON^"$PYPATH"^g src/splicex.py >build/splicex || exit 1 sed -e s^PYTHON^"$PYPATH"^g src/splicex-deshadow.py >build/splicex-deshadow || exit 1
--- a/contrib/splicex/src/make.in Tue Dec 27 19:39:31 2011 +0000 +++ b/contrib/splicex/src/make.in Tue Dec 27 19:45:09 2011 +0000 @@ -61,7 +61,7 @@ rm -f /usr/bin/splicex-deshadow clean: - rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf + rm Makefile DEBIAN/splicex DEBIAN/*.deb build -rf preinstall: rm -rf /etc/splicex
--- a/contrib/splicex/src/pymake.in Tue Dec 27 19:39:31 2011 +0000 +++ b/contrib/splicex/src/pymake.in Tue Dec 27 19:45:09 2011 +0000 @@ -48,7 +48,7 @@ rm -f /usr/bin/splicex-deshadow clean: - rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf + rm Makefile DEBIAN/splicex DEBIAN/*.deb build -rf preinstall: rm -rf /etc/splicex