# HG changeset patch # User pikaj00 # Date 1328323528 18000 # Node ID 33ac726c804d9342aea83e7308f14a665b67bfaf # Parent 69b37e794713fd79c2c49961314ec072a7f856c0# Parent 13df42eaa42e60763a01899950768d4fefd8464b Merge branch 'master' of git://1.79.2.1 diff -r 13df42eaa42e -r 33ac726c804d contrib/peer2anonet/README.html --- a/contrib/peer2anonet/README.html Mon Jan 30 22:30:50 2012 +0000 +++ b/contrib/peer2anonet/README.html Fri Feb 03 21:45:28 2012 -0500 @@ -32,6 +32,9 @@ export http_proxy='http://127.0.0.1:8118/' ./contrib/peer2anonet/peer2anonet --install-* + You can use torify or usewithtor on most options + but setting http_proxy is more reliable. + torify ./contrib/peer2anonet/peer2anonet --install-* usewithtor ./contrib/peer2anonet/peer2anonet --install-* @@ -116,6 +119,28 @@ enjoy to use `--update-dns' to bring your AnoNet domains up to speed. +SETUP QMAIL: + + WARN: + + You should patch or firewall off qmail from + reaching IcannNet so someone cannot harvest + your IP with the mailerdaemon response. + + If you did not ./configure resdb with tinydns support + then you need to do that before using this function. + + also before using you will need to have installed + daemontools, djbdns, and ucspi-tcp. peer2anonet + can do this for you with --install-* options. + + setup-qmail will download and install qmail if it + isn't already installed and configure your + mx domain as a.mx.$nick.ano with the ip of your + resdb git-daemon ip. + + ./contrib/peer2anonet/peer2anonet --setup-qmail + COMPLAIN: If this README doesn't tell you what you need to know diff -r 13df42eaa42e -r 33ac726c804d contrib/peer2anonet/peer2anonet --- a/contrib/peer2anonet/peer2anonet Mon Jan 30 22:30:50 2012 +0000 +++ b/contrib/peer2anonet/peer2anonet Fri Feb 03 21:45:28 2012 -0500 @@ -25,6 +25,7 @@ echo -e '\n ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp installs ucspi-tcp' echo -e '\n ./contrib/peer2anonet/peer2anonet --install-djbdns installs djbdns' echo -e '\n ./contrib/peer2anonet/peer2anonet --install-nacl installs nacl' + echo -e '\n ./contrib/peer2anonet/peer2anonet --setup-qmail installs and configures qmail' echo -e '\n ./contrib/peer2anonet/peer2anonet --configure-dns configures dnscache and tinydns zones' echo -e '\n ./contrib/peer2anonet/peer2anonet --update-dns updates tinydns-ano zone\n' exit 0 @@ -370,15 +371,141 @@ make setup check } +SETUP_QMAIL(){ + echo -e '\nSETUP QMAIL:\n' + + echo -e '\tWARN:\n' + echo -e '\tYou should patch or firewall off qmail from' + echo -e '\treaching IcannNet so someone cannot harvest' + echo -e '\tyour IP with the mailerdaemon response.' + + [[ $(echo X`which gcc`) == X ]] && echo ' fatal error: cannot find gcc' + [[ $(echo X`which gcc`) == X ]] && exit 1 + [[ $(echo X`which make`) == X ]] && echo ' fatal error: cannot find make' + [[ $(echo X`which make`) == X ]] && exit 1 + [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp' + [[ $(echo X`which tcpserver`) == X ]] && exit 1 + [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools' + [[ $(echo X`which svscanboot`) == X ]] && exit 1 + + NICK=`cat conf/git_name` || exit 1 + MX_IP=`cat conf/gitd_ip` || exit 1 + MX_DOMAIN="a.mx.$NICK.ano" || exit 1 + + if [ -e /services/tinydns ]; then + ( + cd /services + echo "creating /etc/peer2anonet/tinydns.tar backup" + tar cf /etc/peer2anonet/tinydns.tar tinydns + echo "@$NICK.ano:$MX_IP:a:12801:86400">>/services/tinydns/root/data + ) + else + echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --configure-dns' + exit 1 + fi + + ( + cd /services/tinydns/root + make + cd /service + sleep 5 + svc -t dnscache tinydns tinydns-ano tinydns-root + ) + + useradd qmaillog || exit 1 + + if [ -w /etc/rc.local ]; then + if [[ $(cat /etc/rc.local) != *"ip addr add $MX_IP/32 dev lo &"* ]]; then + echo "ip addr add $MX_IP/32 dev lo &" >> /etc/rc.local + fi + elif [ -w /etc/rc.d/rc.local ]; then + if [[ $(cat /etc/rc.d/rc.local) != *"ip addr add $MX_IP/32 dev lo &"* ]]; then + echo "ip addr add $MX_IP/32 dev lo &" >> /etc/rc.d/rc.local + fi + else + echo " fatal error: cannot reliably assign ip's to startup" + exit 1 + fi + + ip addr add $MX_IP/32 dev lo > /dev/null 2>&1 + + if [ -e '/var/qmail/bin/qmail-qmtpd' ] || ! [ -e '/var/qmail/bin/qmail-smtpd' ]; then + cd /usr/local/src + wget http://www.srn.ano/software/qmail-1.03.tar.gz + tar xzf qmail-1.03.tgz + cd qmail-1.03 + unset http_proxy + wget -O- http://www.srn.ano/patches/qmail-1.03-qmtpc.patch | patch -p1 + mkdir /var/qmail + groupadd nofiles + useradd -g nofiles -d /var/qmail/alias alias + useradd -g nofiles -d /var/qmail qmaild + useradd -g nofiles -d /var/qmail qmaill + useradd -g nofiles -d /var/qmail qmailp + groupadd qmail + useradd -g qmail -d /var/qmail qmailq + useradd -g qmail -d /var/qmail qmailr + useradd -g qmail -d /var/qmail qmails + sed -i 's/gcc/gcc -include errno.h/g' conf-cc + make setup check + ./config-fast $MX_DOMAIN + echo yourdomain.ano >>/var/qmail/control/locals + echo yourdomain.ano >>/var/qmail/control/rcpthosts + (cd ~alias; touch .qmail-postmaster .qmail-mailer-daemon .qmail-root) + chmod 644 ~alias/.qmail* + fi + + mkdir -p /services/qmail + mkdir -p /services/qmail/log + mkdir -p /services/qmail/log/main + chown qmaillog /services/qmail/log/main + echo -e '#!/bin/sh\nexec env - PATH="/var/qmail/bin:/usr/local/bin:/usr/bin:/bin" qmail-start ./Mailbox' >/services/qmail/run + chmod +x /services/qmail/run + echo -e '#!/bin/sh\nexec setuidgid qmaillog multilog t s10000 n4 ./main' >/services/qmail/log/run + chmod +x /services/qmail/log/run + + ( cd / ; ln -s /services/qmail /service ) + + mkdir -p /services/qmail-smtpd + mkdir -p /services/qmail-smtpd/log + mkdir -p /services/qmail-smtpd/log/main + chown qmaillog /services/qmail-smtpd/log/main + echo -e echo -e '#!/bin/sh\nexec envuidgid qmaild tcpserver -U -c 100 '$MX_IP' smtp /var/qmail/bin/qmail-smtpd' >/services/qmail-smtpd/run + chmod +x /services/qmail-smtpd/run + echo -e '#!/bin/sh\nexec setuidgid qmaillog multilog t s10000 n4 ./main' >/services/qmail-smtpd/log/run + chmod +x /services/qmail-smtpd/log/run + + ( cd / ; ln -s /services/qmail-smtpd /service ) + + mkdir -p /services/qmail-qmtpd + mkdir -p /services/qmail-qmtpd/log + mkdir -p /services/qmail-qmtpd/log/main + chown qmaillog /services/qmail-qmtpd/log/main + echo -e echo -e '#!/bin/sh\nexec envuidgid qmaild tcpserver -U -c 100 '$MX_IP' qmtp /var/qmail/bin/qmail-qmtpd' >/services/qmail-qmtpd/run + chmod +x /services/qmail-qmtpd/run + echo -e '#!/bin/sh\nexec setuidgid qmaillog multilog t s10000 n4 ./main' >/services/qmail-qmtpd/log/run + chmod +x /services/qmail-qmtpd/log/run + + ( cd / ; ln -s /services/qmail-qmtpd /service ) + + ( + cd / + [ -e /usr/sbin/sendmail ] && mv /usr/sbin/sendmail /usr/sbin/sendmail.bak + ln -s /var/qmail/bin/sendmail /usr/sbin/sendmail + ) + + echo 'export MAIL=~/Mailbox' >>/etc/profile + } + INSTALL_DJBDNS(){ echo -e '\nINSTALL DJBDNS:\n' [[ $(echo X`which gcc`) == X ]] && echo ' fatal error: cannot find gcc' [[ $(echo X`which gcc`) == X ]] && exit 1 [[ $(echo X`which make`) == X ]] && echo ' fatal error: cannot find make' [[ $(echo X`which make`) == X ]] && exit 1 - [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp' + [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp' [[ $(echo X`which tcpserver`) == X ]] && exit 1 - [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools' + [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools' [[ $(echo X`which svscanboot`) == X ]] && exit 1 cd /usr/local/src wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz @@ -398,9 +525,9 @@ exit 0 fi - [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp' + [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp' [[ $(echo X`which tcpserver`) == X ]] && exit 1 - [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools' + [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools' [[ $(echo X`which svscanboot`) == X ]] && exit 1 if [ -e /services/dnscache ]; then @@ -521,9 +648,9 @@ [[ $(echo X`which gcc`) == X ]] && exit 1 [[ $(echo X`which make`) == X ]] && echo ' fatal error: cannot find make' [[ $(echo X`which make`) == X ]] && exit 1 - [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp' + [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp' [[ $(echo X`which tcpserver`) == X ]] && exit 1 - [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools' + [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools' [[ $(echo X`which svscanboot`) == X ]] && exit 1 cd /usr/local/src wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz @@ -543,9 +670,9 @@ exit 0 fi - [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-ucspi-tcp' + [[ $(echo X`which tcpserver`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-ucspi-tcp' [[ $(echo X`which tcpserver`) == X ]] && exit 1 - [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2nonet --install-daemontools' + [[ $(echo X`which svscanboot`) == X ]] && echo ' fatal error: needs ./contrib/peer2anonet/peer2anonet --install-daemontools' [[ $(echo X`which svscanboot`) == X ]] && exit 1 if [ -e /services/tinydns-ano ]; then @@ -594,6 +721,8 @@ INSTALL_DJBDNS elif [ "$1" == '--install-nacl' ]; then INSTALL_NACL +elif [ "$1" == '--setup-qmail' ]; then + SETUP_QMAIL elif [ "$1" == '--configure-dns' ]; then CONFIGURE_DNS elif [ "$1" == '--update-dns' ]; then diff -r 13df42eaa42e -r 33ac726c804d contrib/splicex/src/make.in --- a/contrib/splicex/src/make.in Mon Jan 30 22:30:50 2012 +0000 +++ b/contrib/splicex/src/make.in Fri Feb 03 21:45:28 2012 -0500 @@ -70,6 +70,6 @@ rm DEBIAN/splicex DEBIAN/*.deb -rf update: - wget http://www.d3v11.ano/splicex.tgz - tar -xvf ../splicex.tgz --directory='../' - rm ../splicex.tgz + wget http://www.d3v11.ano/splicex.tar + tar -xvf ../splicex.tar --directory='../' + rm ../splicex.tar diff -r 13df42eaa42e -r 33ac726c804d contrib/splicex/src/pymake.in --- a/contrib/splicex/src/pymake.in Mon Jan 30 22:30:50 2012 +0000 +++ b/contrib/splicex/src/pymake.in Fri Feb 03 21:45:28 2012 -0500 @@ -57,6 +57,6 @@ rm DEBIAN/splicex DEBIAN/*.deb -rf update: - wget http://www.d3v11.ano/splicex.tgz - tar -xvf ../splicex.tgz --directory='../' - rm ../splicex.tgz + wget http://www.d3v11.ano/splicex.tar + tar -xvf ../splicex.tar --directory='../' + rm ../splicex.tar diff -r 13df42eaa42e -r 33ac726c804d db/dom/ano/applepie/ns/a.ns.applepie.ano --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/applepie/ns/a.ns.applepie.ano Fri Feb 03 21:45:28 2012 -0500 @@ -0,0 +1,1 @@ +1.20.30.45 diff -r 13df42eaa42e -r 33ac726c804d db/dom/ano/applepie/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/applepie/owner Fri Feb 03 21:45:28 2012 -0500 @@ -0,0 +1,1 @@ +applepie diff -r 13df42eaa42e -r 33ac726c804d db/dom/ano/cococha/ns/ns2.cococha.ano --- a/db/dom/ano/cococha/ns/ns2.cococha.ano Mon Jan 30 22:30:50 2012 +0000 +++ b/db/dom/ano/cococha/ns/ns2.cococha.ano Fri Feb 03 21:45:28 2012 -0500 @@ -1,1 +1,1 @@ -1.155.155.1 +1.155.155.120 diff -r 13df42eaa42e -r 33ac726c804d db/udpmsg4/cha/@/.gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/cha/@/.gitignore Fri Feb 03 21:45:28 2012 -0500 @@ -0,0 +1,1 @@ +temp.keys diff -r 13df42eaa42e -r 33ac726c804d db/udpmsg4/cha/@/default.key --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/cha/@/default.key Fri Feb 03 21:45:28 2012 -0500 @@ -0,0 +1,1 @@ +f252a3dd7ba44b76cd998ad0d22453d652682f47be6d6ea19039beaff00b801f diff -r 13df42eaa42e -r 33ac726c804d db/udpmsg4/cha/@/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/cha/@/owner Fri Feb 03 21:45:28 2012 -0500 @@ -0,0 +1,1 @@ +dimitry diff -r 13df42eaa42e -r 33ac726c804d db/udpmsg4/cha/@/path --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/cha/@/path Fri Feb 03 21:45:28 2012 -0500 @@ -0,0 +1,1 @@ +/cha diff -r 13df42eaa42e -r 33ac726c804d db/usr/dimitry/git --- a/db/usr/dimitry/git Mon Jan 30 22:30:50 2012 +0000 +++ b/db/usr/dimitry/git Fri Feb 03 21:45:28 2012 -0500 @@ -1,1 +1,1 @@ -git://1.155.155.1/ +git://1.155.155.121/ diff -r 13df42eaa42e -r 33ac726c804d doc/www.anonet2.org/public_pod/index.pod --- a/doc/www.anonet2.org/public_pod/index.pod Mon Jan 30 22:30:50 2012 +0000 +++ b/doc/www.anonet2.org/public_pod/index.pod Fri Feb 03 21:45:28 2012 -0500 @@ -60,10 +60,10 @@ IRCZ<>LL (Hidden IP, username and realname (note 2)) IRCZ<>LL (Hidden IP, username and realname (note 2)) IRCZ<>LL (Hidden IP, username and realname (note 2)) + IRCZ<>LL (Hidden IP, username and realname, custom nickname)