Mercurial > hg > anonet-resdb

changeset 760:b2beefc4c200 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 Fri, 04 Nov 2011 18:24:42 -0400
parents d7a53b077d58 (current diff) 4b877b837bee (diff)
children 53702c04e38d
files
diffstat 20 files changed, 47 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/peer2anonet/peer2anonet	Mon Oct 31 17:47:51 2011 -0400
+++ b/contrib/peer2anonet/peer2anonet	Fri Nov 04 18:24:42 2011 -0400
@@ -136,7 +136,15 @@
 #########################################################################
 # Create files to configure the new peering session:
 echo "#!/bin/sh
+# uncomment if your peer has a dynamic IP
+#
 #export REMOTE_FLOAT=1
+
+# uncomment for debugging. you'll need to use ./run to view output instead
+# of svc -u /service/<peer name>
+#
+#export DEBUG=1
+
 export REMOTE_ADDRESS=$REMOTEIP
 export REMOTE_PORT=$PEERPORT
 export LOCAL_PORT=$ADDPORT
@@ -144,11 +152,25 @@
 export PUBLIC_KEY=$PUBKEY
 export TUN_MODE=1
 export INTERFACE=ppp-$PEERNAME
+
+# uncomment if you want to nuke your default gateway and configure
+# routes only to peers through IcannNet. If any of your peers use
+# dynamic IP's or you use Tor or i2p then this is probably NOT a
+# good idea. You may need to modify the DEFAULT_ROUTE code below.
+# If you run into problems with this please email d3v11@d3v11.ano
+# so I can create a patch.
+#
+#DEFAULT_ROUTE=\`ip route show | grep default | cut -d' ' -f 3\`
+#route del default gw \$DEFAULT_ROUTE
+#route add \$REMOTE_ADDRESS gw \$DEFAULT_ROUTE
+
 ( sleep 5;
  ip addr add $P2A_IP peer $PEERIP/32 dev \$INTERFACE scope link
  ip addr add $P2A_ROUTE/32 dev \$INTERFACE scope global
  ip link set dev \$INTERFACE up
- ping -c 1 -I $INTERFACE -r -w 5
+# comment the following ping line to remove pinghack. this is a
+# trick used to help bird connect.
+ ping -c 1 -I \$INTERFACE $PEERIP -r -w 5
 ) &
 exec /usr/sbin/quicktun.nacltai" > /services/"$PEERNAME"/run
 chmod +x /services/"$PEERNAME"/run
@@ -161,8 +183,9 @@
 echo "peer2anonet: New peering session configured.
 Please place your secret key in: /services/$PEERNAME/seckey
 
-To allow remote floating:
-uncomment REMOTE_FLOAT=1 in /services/$PEERNAME/run"
+Some additional options are available in /services/$PEERNAME/run
+Please read the comments in the file for details. You may need to
+restart the bird daemon. ie, svc -t /service/bird "
 
 
 
--- a/contrib/tor2dns/tor2dns/README	Mon Oct 31 17:47:51 2011 -0400
+++ b/contrib/tor2dns/tor2dns/README	Fri Nov 04 18:24:42 2011 -0400
@@ -23,21 +23,10 @@
 
 UPDATE:
 
-# pull a copy using tor 
-usewithtor wget http://nbafkr7odek2wh6r.onion/peer2anonet.tgz
-
 # pull a copy from AnoNet2
-wget http://d3v11.ano/peer2anonet.tgz
-
-
-POST INSTALL:
-	You will want to make sure port fowarding is turned on, on
-	port 8053 of your router, you may also need to adjust your
-	firewall. you can test for success by opening your browser
-	with tor enabled and going to the link given @ the end of
-	your installation. :-) enjoy.
+wget http://d3v11.ano/tor2dns.tgz
 
 NOTE:
 	On some systems /var/lib/tor/tor2dns will need a special owner
 	like "debian-tor". If tor2dns fails for you please troubleshoot
-	your logs, port fowarding, etc.
+	your logs.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/125/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Richard
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/14/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Obee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/cotichopa/ns/a.ns.cotichopa.ano	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+1.2.5.3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/cotichopa/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Richard
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/onet/ns/ns.onet.ano	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+1.1.12.2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/onet/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Obee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/0E/cidr	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+1.1.14.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/0E/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Obee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/42/cidr	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+1.1.66.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/42/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Obee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/02/05/cidr	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+1.2.5.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/02/05/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+Richard
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/HackInt/@/.gitignore	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/HackInt/@/default.key	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+46db3ee63c69084e330fd40c7295bd98a09e3d053f3995aeb2c93e256a71f14c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/HackInt/@/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/HackInt/@/path	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+/HackInt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/Richard/git	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+git://1.2.5.1/
--- a/doc/www.anonet2.org/public_pod/index.pod	Mon Oct 31 17:47:51 2011 -0400
+++ b/doc/www.anonet2.org/public_pod/index.pod	Fri Nov 04 18:24:42 2011 -0400
@@ -61,6 +61,8 @@
  <tr><td>IRCZ<></td><td>L<UFO|irc://anortr.ucis.nl:8805/anonet></td><td>L<aooo|http://www.anonet2.org/irc_anonymity> (Hidden IP, visible username and realname)</td></tr>
  <tr><td>IRCZ<></td><td>L<UFO|irc://irc.kwaaknet.org:6667/anonet></td><td>L<nooo|http://www.anonet2.org/irc_anonymity> (Visible IP, username and realname (warning!))</td></tr>
 -->
+ <tr><td>IRCZ<></td><td>L<d3v11|irc://v7ygpbs5s62zqei6.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
+ <tr><td>IRCZ<></td><td>L<whatis-theplan|irc://mjf6cqigsjeqhsb3.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
 <!--
  <tr><td>TelnetZ<></td><td>L<SRN|telnet://anortr.ucis.nl:8803/></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP and username, custom nickname)</td></tr>
 -->