summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/peer2anonet/README.html25
-rwxr-xr-xcontrib/peer2anonet/peer2anonet145
-rw-r--r--contrib/splicex/src/make.in6
-rw-r--r--contrib/splicex/src/pymake.in6
-rw-r--r--db/dom/ano/applepie/ns/a.ns.applepie.ano1
-rw-r--r--db/dom/ano/applepie/owner1
-rw-r--r--db/dom/ano/cococha/ns/ns2.cococha.ano2
-rw-r--r--db/udpmsg4/cha/@/.gitignore1
-rw-r--r--db/udpmsg4/cha/@/default.key1
-rw-r--r--db/udpmsg4/cha/@/owner1
-rw-r--r--db/udpmsg4/cha/@/path1
-rw-r--r--db/usr/dimitry/git2
-rw-r--r--doc/www.anonet2.org/public_pod/index.pod2
13 files changed, 177 insertions, 17 deletions
diff --git a/contrib/peer2anonet/README.html b/contrib/peer2anonet/README.html
index 4fb5721..0bf6db8 100644
--- a/contrib/peer2anonet/README.html
+++ b/contrib/peer2anonet/README.html
@@ -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.
+<b>SETUP QMAIL:</b>
+
+ <b>WARN:</b>
+
+ 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
+
<b>COMPLAIN:</b>
If this README doesn't tell you what you need to know
diff --git a/contrib/peer2anonet/peer2anonet b/contrib/peer2anonet/peer2anonet
index 657557a..c4961ed 100755
--- a/contrib/peer2anonet/peer2anonet
+++ b/contrib/peer2anonet/peer2anonet
@@ -25,6 +25,7 @@ USAGE(){
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 @@ INSTALL_UCSPI_TCP(){
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 @@ CONFIGURE_DNS(){
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 @@ INSTALL_DJBDNS(){
[[ $(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 @@ UPDATE_DNS(){
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 @@ elif [ "$1" == '--install-djbdns' ]; then
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 --git a/contrib/splicex/src/make.in b/contrib/splicex/src/make.in
index cc6ff49..8315136 100644
--- a/contrib/splicex/src/make.in
+++ b/contrib/splicex/src/make.in
@@ -70,6 +70,6 @@ preinstall:
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 --git a/contrib/splicex/src/pymake.in b/contrib/splicex/src/pymake.in
index 2c0cc44..c1d826c 100644
--- a/contrib/splicex/src/pymake.in
+++ b/contrib/splicex/src/pymake.in
@@ -57,6 +57,6 @@ preinstall:
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 --git a/db/dom/ano/applepie/ns/a.ns.applepie.ano b/db/dom/ano/applepie/ns/a.ns.applepie.ano
new file mode 100644
index 0000000..1690f94
--- /dev/null
+++ b/db/dom/ano/applepie/ns/a.ns.applepie.ano
@@ -0,0 +1 @@
+1.20.30.45
diff --git a/db/dom/ano/applepie/owner b/db/dom/ano/applepie/owner
new file mode 100644
index 0000000..afb4c38
--- /dev/null
+++ b/db/dom/ano/applepie/owner
@@ -0,0 +1 @@
+applepie
diff --git a/db/dom/ano/cococha/ns/ns2.cococha.ano b/db/dom/ano/cococha/ns/ns2.cococha.ano
index 41176d9..c1cbd61 100644
--- a/db/dom/ano/cococha/ns/ns2.cococha.ano
+++ b/db/dom/ano/cococha/ns/ns2.cococha.ano
@@ -1 +1 @@
-1.155.155.1
+1.155.155.120
diff --git a/db/udpmsg4/cha/@/.gitignore b/db/udpmsg4/cha/@/.gitignore
new file mode 100644
index 0000000..b19a917
--- /dev/null
+++ b/db/udpmsg4/cha/@/.gitignore
@@ -0,0 +1 @@
+temp.keys
diff --git a/db/udpmsg4/cha/@/default.key b/db/udpmsg4/cha/@/default.key
new file mode 100644
index 0000000..5a7deee
--- /dev/null
+++ b/db/udpmsg4/cha/@/default.key
@@ -0,0 +1 @@
+f252a3dd7ba44b76cd998ad0d22453d652682f47be6d6ea19039beaff00b801f
diff --git a/db/udpmsg4/cha/@/owner b/db/udpmsg4/cha/@/owner
new file mode 100644
index 0000000..04a9c16
--- /dev/null
+++ b/db/udpmsg4/cha/@/owner
@@ -0,0 +1 @@
+dimitry
diff --git a/db/udpmsg4/cha/@/path b/db/udpmsg4/cha/@/path
new file mode 100644
index 0000000..ac2f609
--- /dev/null
+++ b/db/udpmsg4/cha/@/path
@@ -0,0 +1 @@
+/cha
diff --git a/db/usr/dimitry/git b/db/usr/dimitry/git
index 87a78de..f4f653a 100644
--- a/db/usr/dimitry/git
+++ b/db/usr/dimitry/git
@@ -1 +1 @@
-git://1.155.155.1/
+git://1.155.155.121/
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod
index 8eac6fd..c075ffd 100644
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -60,10 +60,10 @@ Z<><table>
<tr><td>IRCZ<></td><td>L<SRN6 (tor)|irc://5ziqujry3yknhco2.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
<tr><td>IRCZ<></td><td>L<SRN8 (tor)|irc://kvur4ogjijlvxsdm.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
<tr><td>IRCZ<></td><td>L<sevilNatas (tor)|irc://p4hej3mnyqdtxwiu.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
+ <tr><td>IRCZ<></td><td>L<d3v11 (tor)|irc://rbb3cizcd23x7w4g.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
<!--
<tr><td>IRCZ<></td><td>L<UFO|irc://anortr.ucis.nl:8805/anonet></td><td>L<aooo|http://www.anonet2.org/irc_anonymity> (Hidden IP, visible username and realname)</td></tr>
<tr><td>IRCZ<></td><td>L<UFO|irc://irc.kwaaknet.org:6667/anonet></td><td>L<nooo|http://www.anonet2.org/irc_anonymity> (Visible IP, username and realname (warning!))</td></tr>
- <tr><td>IRCZ<></td><td>L<d3v11 (tor)|irc://rbb3cizcd23x7w4g.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
-->
<!--
<tr><td>TelnetZ<></td><td>L<SRN|telnet://anortr.ucis.nl:8803/></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP and username, custom nickname)</td></tr>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 10:14:45 +0000