Mercurial > hg > anonet-resdb
changeset 240:7a391796ea49 draft
Merge branch 'master' of git://git1.somerandomnick.ano
| author | pragmo <pragmo@pragmo.ano> |
|---|---|
| date | Fri, 29 Oct 2010 05:52:42 +0000 |
| parents | 750fe07d268e (diff) f60be8147439 (current diff) |
| children | 049aad72b7b9 |
| files | |
| diffstat | 5 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/w1k1/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano Fri Oct 29 05:52:42 2010 +0000 @@ -0,0 +1,1 @@ +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/w1k1/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano Fri Oct 29 05:52:42 2010 +0000 @@ -0,0 +1,1 @@ +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/w1k1/owner Fri Oct 29 05:52:42 2010 +0000 @@ -0,0 +1,1 @@ +sevilNatas
--- a/doc/www.anonet2.org/public_pod/index.pod Fri Oct 29 04:56:07 2010 +0000 +++ b/doc/www.anonet2.org/public_pod/index.pod Fri Oct 29 05:52:42 2010 +0000 @@ -17,6 +17,9 @@ There are many ways to join AnoNet. If you just want to hang out with us and chat, it's very easy: +If you need some assistance in joining, we have an Internet accesable +webIRC client up at L<http://anonet.serveirc.com/>. + =over =item webchat @@ -333,6 +336,9 @@ =item * IRC Webchat Client (L<http://www.sevilnatas.ano/chat.html>) + +=item * + IRC-Like Chat Rooms [NO ACTIVATION OR VALID EMAILS REQUIRED (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>)]
--- a/scripts/nameserver_autogen/dnsmasq_tld_conffile Fri Oct 29 04:56:07 2010 +0000 +++ b/scripts/nameserver_autogen/dnsmasq_tld_conffile Fri Oct 29 05:52:42 2010 +0000 @@ -15,11 +15,11 @@ 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 + for ns in $($LS db/ip/${a}/${b}/${c}/ns/); do A1=$(scripts/hex2dec ${a}) B1=$(scripts/hex2dec ${b}) C1=$(scripts/hex2dec ${c}) - STR="server=/${C1}.${B1}.${A1}.in-addr.arpa/${ns}" + STR="server=/${C1}.${B1}.${A1}.in-addr.arpa/$(scripts/ns2ip -f ${ns})" echo $STR done fi @@ -31,8 +31,8 @@ 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}" + for ns in $($LS db/dom/${tld}/${domain}/ns/); do + STR="server=/${domain}.${tld}/$(scripts/ns2ip -f ${ns})" echo $STR done; done;