From 063910fbc22d4d22489d53843cf08b0590b079af Mon Sep 17 00:00:00 2001
From: d3v11 <d3v11@d3v11.ano>
Date: Sun, 29 Jan 2012 01:09:53 +0000
Subject: added documentation for --setup-qmail and fixed autoinstaller for tor
 users. please see TORIFY section of the README or view
 www.d3v11.ano/peer2anonet

---
 contrib/peer2anonet/README.html | 19 +++++++++++++++++++
 contrib/peer2anonet/peer2anonet |  1 +
 2 files changed, 20 insertions(+)

diff --git a/contrib/peer2anonet/README.html b/contrib/peer2anonet/README.html
index 4fb5721..1f6e227 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,22 @@
     enjoy to use `--update-dns' to bring your AnoNet
     domains up to speed.
 
+<b>SETUP QMAIL:</b>
+
+    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 8a06432..61412e7 100755
--- a/contrib/peer2anonet/peer2anonet
+++ b/contrib/peer2anonet/peer2anonet
@@ -428,6 +428,7 @@ SETUP_QMAIL(){
         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
-- 
cgit v1.2.3