From 85696442851e30e6aaedd1046303d4e71eaee079 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <psyc://psyced.org/@youbroketheinternet>
Date: Tue, 29 Apr 2014 01:49:52 +0200
Subject: [PATCH] it's even simpler with dnsmasq! thanks, alice!

---
 bin/psyconf      | 4 +++-
 tor/dnsmasq.conf | 8 ++++++++
 tor/unbound.conf | 7 ++++---
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 tor/dnsmasq.conf

diff --git a/bin/psyconf b/bin/psyconf
index 8437ed2..7f121d2 100755
--- a/bin/psyconf
+++ b/bin/psyconf
@@ -376,7 +376,9 @@ X
 			$torify = "torsocks";
 			say "Enabling PSYC federation over Tor: Using "
 				. "torsocks wrapper around psyced.\n";
-			say "Warning: Maybe, if you install unbound.conf, it actually works.\n"
+			say "Warning: Make sure either dnsmasq.conf or "
+				. "unbound.conf are in\n"
+				. "place for .onion resolution to function.\n";
 		}
 	}
 	## ldmud bug number two
diff --git a/tor/dnsmasq.conf b/tor/dnsmasq.conf
new file mode 100644
index 0000000..3d6ccb9
--- /dev/null
+++ b/tor/dnsmasq.conf
@@ -0,0 +1,8 @@
+# if you already have dnsmasq on your system,
+# this should go into /etc/dnsmasq.conf:
+
+server=/onion/127.0.0.1#9053
+
+# or you can pass --server=/onion/127.0.0.1#9053
+# to dnsmasq on the command line
+
diff --git a/tor/unbound.conf b/tor/unbound.conf
index 9534aa0..6f7d450 100644
--- a/tor/unbound.conf
+++ b/tor/unbound.conf
@@ -1,7 +1,8 @@
-# tell a localhost "unbound" DNS server to
-# forward .onion requests into Tor
-# courtesy of tg of secushare.org
+# if you don't want dnsmasq on your system you
+# can tell a localhost "unbound" DNS server to
+# forward .onion requests into Tor.
 #
+# courtesy of tg of secushare.org
 # see the unbound.conf(5) man page for more.
 
 server: