Mercurial > hg > anonet-resdb

changeset 851:ac62c140366b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of git://git1.srn.ano
author pikaj00 <pikaj00@gmail.com>
date Tue, 27 Dec 2011 14:39:14 -0500
parents fd59bad51e25 (diff) 1a037f075070 (current diff)
children 084fe9662481
files
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/peer2anonet/README.html	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/peer2anonet/README.html	Tue Dec 27 14:39:14 2011 -0500
@@ -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
--- a/contrib/peer2anonet/peer2anonet	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/peer2anonet/peer2anonet	Tue Dec 27 14:39:14 2011 -0500
@@ -142,7 +142,10 @@
 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 @@
  interface \"eth0\";
  import filter only_AnoNet;
 }" > /services/bird/bird.conf
+    fi
 
     for PEER in `ls /etc/peer2anonet/peers`; do
         mkdir -p /services/"$PEER"