diff options
| -rw-r--r-- | contrib/peer2anonet/README.html | 4 | ||||
| -rwxr-xr-x | contrib/peer2anonet/peer2anonet | 6 |
2 files changed, 9 insertions, 1 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..4895df2 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" |