changeset 90:baece7943fe7 draft

Merge git://1.22.48.100
author Nick <nick@somerandomnick.ano>
date Wed, 04 Aug 2010 21:43:21 +0000
parents e90a139c47ad (diff) e73e4fac95f5 (current diff)
children 17e4bef39c08
files
diffstat 17 files changed, 67 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/888/owner	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+pragmo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/pragmo/ns/b30a3fc880c970d4b4f945dd82af4de3.ns.pragmo.ano	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+1.0.17.100
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/pragmo/owner	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+pragmo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/11/cidr	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+1.0.17.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/11/ns/b30a3fc880c970d4b4f945dd82af4de3.ns.pragmo.ano	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+1.0.17.100
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/11/owner	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+pragmo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/9/F/F/F/F/A/A/A/A/C/A/F/E/cidr	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+fd96:ffff:aaaa:cafe::/64
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/9/F/F/F/F/A/A/A/A/C/A/F/E/ns/b30a3fc880c970d4b4f945dd82af4de3.ns.pragmo.ano	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+1.0.27.100
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/9/F/F/F/F/A/A/A/A/C/A/F/E/owner	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+pragmo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/pragmo/git	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+git://pragmo.ano/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/pragmo/irc	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,1 @@
+irc://irc.pragmo.ano/atomic
--- a/doc/www.anonet2.org/public_pod/index.pod	Wed Aug 04 23:36:03 2010 +0200
+++ b/doc/www.anonet2.org/public_pod/index.pod	Wed Aug 04 21:43:21 2010 +0000
@@ -89,7 +89,10 @@
 can join "the club" at L<irc://1.3.3.7:6667/anonet>,
 or L<irc://irc.somerandomnick.ano:6667/RendezVous>
 (L<irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for
-some reason).  If you don't have an IRC client handy (or if you're
+some reason), or L<irc://irc.pragmo.ano:6667/atomic> 
+(L<irc://1.0.17.100:6667/atomic>, for the same reaon as before and 
+if you want you can use SSL on port 6697).
+If you don't have an IRC client handy (or if you're
 too lazy to set it up to avoid leaking your real info), you can
 just telnet over to L<telnet://irc.somerandomnick.ano:2323/> (or
 L<telnet://ufo-net.nl:2323/>, from the outside).  Alternatively, you
@@ -174,7 +177,7 @@
 
 =item *
 
-Live WorldCup Stream (thanks, SRN)
+Live WorldCup Stream (offline until next year)
 
 =item *
 
@@ -198,7 +201,7 @@
 
 =item *
 
-git (including a decentralized "wiki" replacement) (L<git://git1.somerandomnick.ano/>, L<http://anogit.ucis.ano/.git/>, and possibly other repos)
+git (including a decentralized "wiki" replacement) (L<git://git1.somerandomnick.ano/>, L<http://anogit.ucis.ano/.git/>, L<git://1.0.48.100/>, L<git://pragmo.ano/>, and possibly other repos)
 
 =item *
 
@@ -208,6 +211,10 @@
 
 Web-based resource database viewer: L<http://ix.ucis.ano/anonet/>
 
+=item *
+
+Decentralized Web mirroring service (at least L<http://a.mirror.somerandomnick.ano>) (technical difficulties)
+
 =back
 
 Here's a list of things that somebody claims to be working on:
--- a/doc/www.anonet2.org/public_pod/links.pod	Wed Aug 04 23:36:03 2010 +0200
+++ b/doc/www.anonet2.org/public_pod/links.pod	Wed Aug 04 21:43:21 2010 +0000
@@ -4,6 +4,8 @@
 
 This is a collection of links that you may find interesting:
 
+20100720 - L<http://www.wired.com/politics/security/commentary/securitymatters/2006/05/70886> (thanks L<http://darknet.me/privacy.html>)
+
 20100518 - L<http://torrentfreak.com/damned-pirates-hollywood-sets-10-billion-box-office-record-091211/>
 
 20100518 - L<http://torrentfreak.com/mpaa-and-riaa-call-for-copyright-police-state-100415/>
--- a/gitd	Wed Aug 04 23:36:03 2010 +0200
+++ b/gitd	Wed Aug 04 21:43:21 2010 +0000
@@ -1,3 +1,4 @@
 #!/bin/sh
 repodir="$(dirname $0)"
+touch "$repodir"/.git/git-daemon-export-ok
 exec git daemon --listen="$(cat "$repodir"/conf/gitd_ip)" --base-path="$(cat "$repodir"/conf/gitd_basepath)"
--- a/scripts/check_db_safety	Wed Aug 04 23:36:03 2010 +0200
+++ b/scripts/check_db_safety	Wed Aug 04 21:43:21 2010 +0000
@@ -1,23 +1,23 @@
 #!/bin/sh
-if [ "$(ls db/dom/ | tr -d 'a-z0-9\n-' | wc -c)" != 0 ]; then
+if [ "$(ls db/dom/ | tr -d 'a-z0-9\n-' | wc -c | tr -d ' \t')" != 0 ]; then
  echo "There's a bad TLD.  You probably don't want to run any shell scripts." >&2
  exit 1
 fi
 for tld in db/dom/* ; do
- if [ "$(ls $tld/ | tr -d 'a-z0-9\n-' | wc -c)" != 0 ]; then
+ if [ "$(ls $tld/ | tr -d 'a-z0-9\n-' | wc -c | tr -d ' \t')" != 0 ]; then
   tld="$(basename $tld)"
   echo "There's a bad domain under $tld." >&2
   echo "You probably don't want to run any shell scripts." >&2
   exit 1
  fi
  for dom in $tld/* ; do
-  if [ "$(ls $dom/ns/ | tr -d 'a-z0-9\n.-' | wc -c)" != 0 ]; then
+  if [ "$(ls $dom/ns/ | tr -d 'a-z0-9\n.-' | wc -c | tr -d ' \t')" != 0 ]; then
    domain="$(basename $dom).$(basename $tld)"
    echo "There's a bad nameserver under $domain." >&2
    echo "You probably don't want to run any shell scripts." >&2
   fi
   for ns in $dom/ns/* ; do
-   if [ "$(cat $ns | tr -d '0-9.\n' | wc -c)" != 0 ]; then
+   if [ "$(cat $ns | tr -d '0-9.\n' | wc -c | tr -d ' \t')" != 0 ]; then
     domain="$(basename $dom).$(basename $tld)"
     nsname="$(basename $ns)"
     echo "There's a bad nameserver IP under $domain, for" >&2
@@ -27,28 +27,28 @@
   done
  done
 done
-if [ "$(ls db/ip/ | tr -d 'A-F0-9\n' | wc -c)" != 0 ]; then
+if [ "$(ls db/ip/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
  echo "There's a bad first octet.  You probably don't want to run any shell scripts." >&2
  exit 1
  for first in db/ip/* ; do
-  if [ "$(ls $first/ | tr -d 'A-F0-9\n' | wc -c)" != 0 ]; then
+  if [ "$(ls $first/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
    echo "There's a bad second octet under $first." >&2
    echo "You probably don't want to run any shell scripts." >&2
    exit 1
    for second in $first/* ; do
-    if [ "$(ls $second/ | tr -d 'A-F0-9\n' | wc -c)" != 0 ]; then
+    if [ "$(ls $second/ | tr -d 'A-F0-9\n' | wc -c | tr -d ' \t')" != 0 ]; then
      echo "There's a bad third octet under $second." >&2
      echo "You probably don't want to run any shell scripts." >&2
      exit 1
     fi
     for third in $second/* ; do
-     if [ "$(ls $third/ns/ | tr -d 'a-z0-9\n.-' | wc -c)" != 0 ]; then
+     if [ "$(ls $third/ns/ | tr -d 'a-z0-9\n.-' | wc -c | tr -d ' \t')" != 0 ]; then
       ip="$(basename $first).$(basename $second).$(basename $third).0/24"
       echo "There's a bad nameserver under $ip." >&2
       echo "You probably don't want to run any shell scripts." >&2
      fi
      for ns in $third/ns/* ; do
-      if [ "$(cat $ns | tr -d '0-9.\n' | wc -c)" != 0 ]; then
+      if [ "$(cat $ns | tr -d '0-9.\n' | wc -c | tr -d ' \t')" != 0 ]; then
        ip="$(basename $first).$(basename $second).$(basename $third).0/24"
        nsname="$(basename $ns)"
        echo "There's a bad nameserver IP under $ip, for" >&2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/nameserver_autogen/dnsmasq_tld_conffile	Wed Aug 04 21:43:21 2010 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+#Remember to redirect the output into some file!
+
+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}"
+			if [ "$(grep $STR /etc/dnsmasq.conf)" = "" ]; then
+				echo $STR
+			fi
+		done; 
+	done; 
+done
--- a/scripts/nameserver_autogen/tinydns_tld_datafile	Wed Aug 04 23:36:03 2010 +0200
+++ b/scripts/nameserver_autogen/tinydns_tld_datafile	Wed Aug 04 21:43:21 2010 +0000
@@ -4,22 +4,28 @@
 fi
 tldsrvrname="$(./scripts/conf_var tinydns__tldsrvrname uz5fvb7zdqyuz4q8ysjdfuf04kzd2lrt0l6fp4uyguxdg5tfut06ck.anons.somerandomnick.ano)"
 tldsrvrip="$(./scripts/conf_var tinydns__tldsrvrip 1.0.27.37)"
-for tld in db/ip/* ; do
- first="$(basename $tld | ./scripts/hex2dec)"
- tldname="$first.in-addr.arpa"
- echo "+$tldsrvrname:$tldsrvrip:3600"
- echo ".$tldname::$tldsrvrname"
- for ip in $tld/*/* ; do
-  third="$(basename $ip | ./scripts/hex2dec)"
-  second="$(basename $(dirname $ip) | ./scripts/hex2dec)"
-  first="$(basename $(dirname $(dirname $ip)) | ./scripts/hex2dec)"
-  domain="$third.$second.$first.in-addr.arpa"
-  for ns in $ip/ns/* ; do
-   nsip="$(cat $ns)"
-   nsname="$(basename $ns)"
-   echo "&$domain:$nsip:$nsname"
+for tld in db/ip/?? ; do
+ if [ "x$(basename $tld)" != 'x??' ]; then
+  first="$(basename $tld | ./scripts/hex2dec)"
+  tldname="$first.in-addr.arpa"
+  echo "+$tldsrvrname:$tldsrvrip:3600"
+  echo ".$tldname::$tldsrvrname"
+  for ip in $tld/??/?? ; do
+   if [ "x$(basename $ip)" != 'x??' ]; then
+    third="$(basename $ip | ./scripts/hex2dec)"
+    second="$(basename $(dirname $ip) | ./scripts/hex2dec)"
+    first="$(basename $(dirname $(dirname $ip)) | ./scripts/hex2dec)"
+    domain="$third.$second.$first.in-addr.arpa"
+    for ns in $ip/ns/* ; do
+     nsname="$(basename $ns)"
+     if [ "x$nsname" != 'x*' ]; then
+      nsip="$(cat $ns)"
+      echo "&$domain:$nsip:$nsname"
+     fi
+    done
+   fi
   done
- done
+ fi
 done
 for tld in db/dom/* ; do
  tldname="$(basename $tld)"