Mercurial > hg > anonet-resdb
changeset 371:0e3e0d0268f9 draft
Merge git://1.101.1.6
| author | Nick <nick@somerandomnick.ano> |
|---|---|
| date | Thu, 13 Jan 2011 05:11:52 +0000 |
| parents | 5520f49a1800 (diff) 96e6083e5949 (current diff) |
| children | 7832e9283f0f |
| files | |
| diffstat | 17 files changed, 41 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.gitignore Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,2 @@ +conf +export
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/as/62487/owner Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +Atiti
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/1984/ns/ns.1984.ano Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +1.9.8.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/1984/ns/ns1.1984.ano Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +1.9.8.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/1984/owner Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +BrainBox
--- a/db/dom/ano/search/ns/ns1.search.ano Thu Jan 13 05:03:21 2011 +0000 +++ b/db/dom/ano/search/ns/ns1.search.ano Thu Jan 13 05:11:52 2011 +0000 @@ -1,1 +1,1 @@ -1.0.9.50 +1.1.123.1
--- a/db/dom/ano/search/owner Thu Jan 13 05:03:21 2011 +0000 +++ b/db/dom/ano/search/owner Thu Jan 13 05:11:52 2011 +0000 @@ -1,1 +1,1 @@ -rn_zippy +atiti
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/7B/cidr Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +1.1.123.0/24
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/ip/01/01/7B/owner Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +atiti
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/BrainBox/git Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +git://1.9.8.4/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/atiti/git Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +git://1.1.123.1/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/lex/email Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +lex@lynx.ano
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/lex/irc Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +irc://1.3.9.1/anonet
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/lex/nntp Thu Jan 13 05:11:52 2011 +0000 @@ -0,0 +1,1 @@ +1.3.9.1
--- a/doc/www.anonet2.org/public_pod/index.pod Thu Jan 13 05:03:21 2011 +0000 +++ b/doc/www.anonet2.org/public_pod/index.pod Thu Jan 13 05:11:52 2011 +0000 @@ -61,7 +61,26 @@ =back -If you're feeling adventurous enough to connect at the IP level, L<UFO has a client port|http://ix.ucis.nl/clientport.php>. Once you're online, you can reconnect to IRC from inside AnoNet: +If you're feeling adventurous enough to connect at the IP level, there +are a few options available: + +=over + +=item * + +L<UFO has a client port.|http://ix.ucis.nl/clientport.php> (You will +need openvpn for this option, but there is no need for routing software.) + +=item * + +It is possible to negotiate your first peering on IRC, completely +bypassing the client port. (For this option you can use quicktun, +openvpn, or tinc. You will also need routing software, for example bird +or zebra. If you are on Windows, DnRouter can do everything.) + +=back + +Once you're online, you can reconnect to IRC from inside AnoNet: =begin xhtml
--- a/git-commit Thu Jan 13 05:03:21 2011 +0000 +++ b/git-commit Thu Jan 13 05:11:52 2011 +0000 @@ -1,4 +1,4 @@ #!/bin/sh -git add configure db doc git-commit gitd scripts contrib +git add configure db doc git-commit gitd scripts contrib .gitignore git commit test -x /usr/lib/git-core/git-update-server-info && /usr/lib/git-core/git-update-server-info
--- a/scripts/nameserver_autogen/bind_tld_zonefile Thu Jan 13 05:03:21 2011 +0000 +++ b/scripts/nameserver_autogen/bind_tld_zonefile Thu Jan 13 05:11:52 2011 +0000 @@ -8,11 +8,14 @@ $servers = scandir($name.'/ns/'); foreach ($servers as $server) { if ($server[0] == '.') continue; - print($name.' IN NS '.$server."\n"); + if (substr($name, -4) == ".ano") $name .= "."; + $fqserver = $server; + if (substr($server, -4) == ".ano") $fqserver .= "."; + print($name.' IN NS '.$fqserver."\n"); $ips = file($name.'/ns/'.$server, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); foreach ($ips as $ip) { - print($server.' IN A '.$ip."\n"); + print($fqserver.' IN A '.$ip."\n"); } } }