Mercurial > hg > anonet-resdb
changeset 239:f60be8147439 draft
Merge http://anogit.ucis.ano/
| author | Nick <nick@somerandomnick.ano> |
|---|---|
| date | Fri, 29 Oct 2010 04:56:07 +0000 |
| parents | c4cad8756f84 (diff) 57a9c660edd5 (current diff) |
| children | 7a391796ea49 941c71543382 df5f684a883f |
| files | |
| diffstat | 2 files changed, 28 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/index.pod Wed Oct 27 18:21:36 2010 +0200 +++ b/doc/www.anonet2.org/public_pod/index.pod Fri Oct 29 04:56:07 2010 +0000 @@ -20,10 +20,7 @@ =over =item webchat -L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous) -<<<<<<< HEAD -<<<<<<< HEAD L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity) =item webchat @@ -33,23 +30,22 @@ =item webchat L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity) -======= -L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) ->>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 -======= -L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) ->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333 =item IRC chat -L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity) + +L<SRN|telnet://ufo-net.nl:2324/> (hides your identity) -L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity) +=item IRC chat -L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity) +L<UFO|telnet://ufo-net.nl:2325/> (partly hides your identity) =item telnet chat -L<SRN|telnet://anortr.ucis.nl:8803> (hides your identity) +L<SRN|telnet://ufo-net.nl:2323/> (hides your identity) + +=item IRC chat + +L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity) =back @@ -61,19 +57,7 @@ =item webchat -<<<<<<< HEAD -<<<<<<< HEAD L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity) -======= -L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity) - -L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity) ->>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 -======= -L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity) - -L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity) ->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333 =item IRC @@ -81,8 +65,12 @@ (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some reason) (automatically hides your identity) +=item IRC + L<KwaakNet|irc://1.3.3.7:6667/anonet> (doesn't automatically hide your identity) +=item IRC + L<pragmo|irc://irc.pragmo.ano:6667/atomic> (L<pragmo|irc://1.0.16.111:6667/atomic>, for the same reason as before and if you want you can use SSL on port 6697) (doesn't automatically
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/ns2ip Fri Oct 29 04:56:07 2010 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh + +opt="$1" +if [ "x$opt" = "x-f" ]; then + shift +elif ! ./scripts/check_db_safety; then + exit 1 +fi +ns="$1" + +path="`find db/dom/ -ipath '*/ns/'\"$ns\" -size +1c | head -n 1`" +if [ "x$path" = "x" ]; then + exit 1 +fi +cat "$path"