diff options
| -rw-r--r-- | contrib/peer2anonet/README.html | 4 | ||||
| -rwxr-xr-x | contrib/peer2anonet/peer2anonet | 22 | ||||
| -rwxr-xr-x | contrib/splicex/configure | 1 | ||||
| -rw-r--r-- | contrib/splicex/src/make.in | 2 | ||||
| -rw-r--r-- | contrib/splicex/src/pymake.in | 2 |
5 files changed, 20 insertions, 11 deletions
diff --git a/contrib/peer2anonet/README.html b/contrib/peer2anonet/README.html index 6866354..52c732b 100644 --- a/contrib/peer2anonet/README.html +++ b/contrib/peer2anonet/README.html @@ -93,6 +93,10 @@ <b>CONFIGURATION FILES:</b> + If /etc/peer2anonet/bird.conf exists, then peer2anonet + will not create a new bird. Instead it will use this + bird.conf and append new protocols to it. + /etc/peer2anonet/peers/$PEER/* contains: asn local_port peering_ip pubkey remote_ip remote_port run seckey diff --git a/contrib/peer2anonet/peer2anonet b/contrib/peer2anonet/peer2anonet index 152f4a4..715f507 100755 --- a/contrib/peer2anonet/peer2anonet +++ b/contrib/peer2anonet/peer2anonet @@ -142,7 +142,10 @@ UPDATE(){ bird -c bird.conf -d' > /services/bird/run chmod +x /services/bird/run - echo "function n_AnoNet_mine (prefix arg) { + if [ -e /etc/peer2anonet/bird.conf ]; then + cp /etc/peer2anonet/bird.conf /services/bird/bird.conf + else + echo "function n_AnoNet_mine (prefix arg) { if arg ~ [ $P2A_NET/24+ ] then return true; return false; }; @@ -190,6 +193,7 @@ protocol direct direct_AnoNet_routes { table AnoNet_routes; interface \"eth0\"; import filter only_AnoNet; }" > /services/bird/bird.conf + fi for PEER in `ls /etc/peer2anonet/peers`; do mkdir -p /services/"$PEER" @@ -409,14 +413,14 @@ CONFIGURE_DNS(){ ) 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 diff --git a/contrib/splicex/configure b/contrib/splicex/configure index a01825c..ad7492d 100755 --- a/contrib/splicex/configure +++ b/contrib/splicex/configure @@ -74,6 +74,7 @@ if [ -z "$2" ]; then 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 diff --git a/contrib/splicex/src/make.in b/contrib/splicex/src/make.in index 3ebd9a0..cc6ff49 100644 --- a/contrib/splicex/src/make.in +++ b/contrib/splicex/src/make.in @@ -61,7 +61,7 @@ uninstall: 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 diff --git a/contrib/splicex/src/pymake.in b/contrib/splicex/src/pymake.in index 5ca74e2..2c0cc44 100644 --- a/contrib/splicex/src/pymake.in +++ b/contrib/splicex/src/pymake.in @@ -48,7 +48,7 @@ uninstall: 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 |