changeset 183:eed932f2ea7f draft

Merge git://1.0.49.10 Conflicts: doc/www.anonet2.org/public_pod/index.pod
author Nick <nick@somerandomnick.ano>
date Thu, 14 Oct 2010 03:01:24 +0000
parents 91a0f3fd54b7 (diff) a4b6adae5f0e (current diff)
children e49a9157c13e
files doc/www.anonet2.org/public_pod/index.pod
diffstat 10 files changed, 28 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/112/owner	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/somerandomwiki/owner	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/srn/owner	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/srw/owner	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/70/cidr	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+1.0.112.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/70/ns/ns1.wakawaka.ano	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/70/owner	Thu Oct 14 03:01:24 2010 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- a/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Wed Oct 13 21:53:59 2010 -0500
+++ b/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Thu Oct 14 03:01:24 2010 +0000
@@ -39,7 +39,7 @@
  Z<><tr>Z<><th>Actual Government betrays Claimed PurposeZ<></th>Z<><td>yesZ<></td>Z<><td>noZ<></td>Z<><td>noZ<></td>Z<><td>noZ<></td>Z<></tr>
  Z<><tr>Z<><th>Centralized Critical InfrastructureZ<></th>Z<><td>wiki (includes resource database), client port, IRCZ<></td>Z<><td>noneZ<></td>Z<><td>wiki, IRCZ<></td>Z<><td>allZ<></td>Z<></tr>
  Z<><tr>Z<><th>Decentralized Critical InfrastructureZ<></th>Z<><td>routingZ<></td>Z<><td>allZ<></td>Z<><td>routing, resource databaseZ<></td>Z<><td>noneZ<></td>Z<></tr>
- Z<><tr>Z<><th>Current SizeZ<></th>Z<><td>20-30Z<></td>Z<><td>~10Z<></td>Z<><td>40-50Z<></td>Z<><td>&lt;5Z<></td>Z<></tr>
+ Z<><tr>Z<><th>Current SizeZ<></th>Z<><td>20-30Z<></td>Z<><td>~15Z<></td>Z<><td>40-50Z<></td>Z<><td>&lt;5Z<></td>Z<></tr>
  Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>~0%Z<></td>Z<><td>~20%Z<></td>Z<><td>~5%Z<></td>Z<><td>~10%Z<></td>Z<></tr>
  Z<><tr>Z<><th>Activity LevelZ<></th>Z<><td>mediumZ<></td>Z<><td>mediumZ<></td>Z<><td>mediumZ<></td>Z<><td>lowZ<></td>Z<></tr>
  Z<><tr>Z<><th>Interdarknet ConnectivityZ<></th>Z<><td>censored access to AnoNet2 (must use AnoNet2 DNS), censored access to dn42 (must use AnoNet2 DNS)Z<></td>Z<><td>full routing to part of AnoNet1, full routing to part of dn42, full routing to VAnetZ<></td>Z<><td>censored access to AnoNet (1&amp;2, must use SRN's DNS), censored access to VAnet (must use SRN's DNS)Z<></td>Z<><td>full routing to part of AnoNet1, full routing to AnoNet2, full routing to part of dn42Z<></td>Z<></tr>
--- a/doc/www.anonet2.org/public_pod/index.pod	Wed Oct 13 21:53:59 2010 -0500
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Oct 14 03:01:24 2010 +0000
@@ -269,6 +269,14 @@
 
 =item *
 
+L<WikiLeaks Mirror|http://wikileaks.ucis.ano/> (The real WikiLeaks may be down, but not our mirror!)
+
+=item *
+
+L<Some Random Wiki|http://www.somerandomwiki.ano/>
+
+=item *
+
 Pastebin (without time-zone leaks, L<http://www.sevilnatas.ano/pastebin/>)
 
 =item *
@@ -281,7 +289,7 @@
 
 =item *
 
-DNS (Recursive: 1.0.27.38; TLD: 1.0.27.37; Root: 1.0.27.39)
+DNS (Recursive: 1.0.27.38 & 1.3.3.64; TLD: 1.0.27.37 & 1.3.3.66; Root: 1.0.27.39 & 1.3.3.65)
 
 =item *
 
@@ -305,7 +313,7 @@
 
 =item *
 
-outbound HTTP proxies to the public Internet (L<http://a.privoxy.somerandomnick.ano:8118/> and L<http://b.privoxy.somerandomnick.ano:8118/>)
+outbound HTTP proxies to the public Internet (L<http://a.privoxy.somerandomnick.ano:8118/>, L<http://b.privoxy.somerandomnick.ano:8118/>, L<http://a.polipo.somerandomnick.ano:8118/> and L<http://a.polipo.somerandomnick.ano:8118/>)
 
 =item *
 
@@ -382,8 +390,8 @@
 
 =item Outbound HTTP Proxies
 
-SRN runs two right now and ryuk runs one, but that means between the two
-of them they can snoop on all HTTP traffic from AnoNet2 to IcannNet.
+SRN runs three right now and ryuk runs one, but that means between the
+two of them they can snoop on all HTTP traffic from AnoNet2 to IcannNet.
 Having more proxies gives you an alternative to blindly trusting SRN
 and ryuk not to sell your click-through data to Google, invert the order
 of search results to your queries, and inject malicious JavaScript into
--- a/scripts/nameserver_autogen/dnsmasq_tld_conffile	Wed Oct 13 21:53:59 2010 -0500
+++ b/scripts/nameserver_autogen/dnsmasq_tld_conffile	Thu Oct 14 03:01:24 2010 +0000
@@ -8,9 +8,12 @@
 
 sh scripts/check_db_safety || exit 1
 
-for a in $(ls db/ip/); do
-	for b in $(ls db/ip/${a}); do
-		for c in $(ls db/ip/${a}/${b}); do
+
+LS="ls --color=never"
+
+for a in $($LS db/ip/); do
+	for b in $($LS db/ip/${a}); do
+		for c in $($LS db/ip/${a}/${b}); do
 			if [ -d db/ip/${a}/${b}/${c}/ns/ ]; then
 			 	for ns in $(cat db/ip/${a}/${b}/${c}/ns/*); do
 					A1=$(scripts/hex2dec ${a})
@@ -26,8 +29,8 @@
 
 echo
 
-for tld in $(ls db/dom/); do 
-	for domain in $(ls db/dom/${tld}/); do 
+for tld in $($LS db/dom/); do 
+	for domain in $($LS db/dom/${tld}/); do 
 		for ns in $(cat db/dom/${tld}/${domain}/ns/*); do 
 			STR="server=/${domain}.${tld}/${ns}"
 			echo $STR