Move DNS handling to a module

3 files changed, 50 insertions, 47 deletions

diff --git a/data/example.conf b/data/example.conf
index 205a0ead9..9f4a568dd 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1035,52 +1035,6 @@ mail
 }
 
 /*
- * [OPTIONAL] DNS Config
- *
- * This section is used to configure DNS.
- * At this time DNS is only used by a few modules (m_dnsbl and os_dns)
- * and is not required by the core to function.
- */
-dns
-{
-	/* 
-	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
-	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
-	 * from ipconfig /all and put the IP here
-	 */
-	nameserver = "/etc/resolv.conf"
-	#nameserver = "127.0.0.1"
-
-	/*
-	 * How long to wait in seconds before a DNS query has timed out
-	 */
-	timeout = 5
-
-	/* Only edit below if you are expecting to use os_dns */
-
-	/*
-	 * The IP and port services use to listen for DNS queries.
-	 * Note that ports less than 1024 are privileged on UNIX/Linux systems, and
-	 * require Anope to be started as root. If you do this, it is recommended you
-	 * set options:user and options:group so Anope can change users after binding
-	 * to this port.
-	 */
-	ip = "0.0.0.0"
-	port = 53
-
-	/*
-	 * SOA record information.
-	 */
-	 admin = "admin@example.com"
-	 /* This should be the names of the public facing nameserver serving the records */
-	 nameservers = "ns1.example.com ns2.example.com"
-	 /* The time slave servers are allowed to cache. This should be reasonably low
-	  * if you want your records to be updated without much delay.
-	  */
-	 refresh = 3600
-}
-
-/*
  * [REQUIRED] Database configuration.
  *
  * This section is used to configure databases used by Anope.
diff --git a/data/modules.example.conf b/data/modules.example.conf
index a9c7d5cb9..7137975fa 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -17,13 +17,59 @@
 module { name = "help" }
 
 /*
+ * m_dns
+ *
+ * Adds support for the DNS protocol. By itself this module does nothing useful,
+ * but other modules such as m_dnsbl and os_dns require this.
+ */
+#module { name = "m_dns" }
+dns
+{
+	/* 
+	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
+	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
+	 * from ipconfig /all and put the IP here
+	 */
+	nameserver = "/etc/resolv.conf"
+	#nameserver = "127.0.0.1"
+
+	/*
+	 * How long to wait in seconds before a DNS query has timed out
+	 */
+	timeout = 5
+
+	/* Only edit below if you are expecting to use os_dns or otherwise answer DNS queries. */
+
+	/*
+	 * The IP and port services use to listen for DNS queries.
+	 * Note that ports less than 1024 are privileged on UNIX/Linux systems, and
+	 * require Anope to be started as root. If you do this, it is recommended you
+	 * set options:user and options:group so Anope can change users after binding
+	 * to this port.
+	 */
+	ip = "0.0.0.0"
+	port = 53
+
+	/*
+	 * SOA record information.
+	 */
+	 admin = "admin@example.com"
+	 /* This should be the names of the public facing nameserver serving the records */
+	 nameservers = "ns1.example.com ns2.example.com"
+	 /* The time slave servers are allowed to cache. This should be reasonably low
+	  * if you want your records to be updated without much delay.
+	  */
+	 refresh = 3600
+}
+
+/*
  * m_dnsbl
  *
  * Allows configurable DNS blacklists to check connecting users against. If a user
  * is found on the blacklist they will be immediately banned. This is a crucial module
  * to prevent bot attacks.
  */
-module { name = "m_dnsbl" }
+#module { name = "m_dnsbl" }
 m_dnsbl
 {
 	/*
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 8a887c5ea..cb3f19cc4 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -359,6 +359,8 @@ defcon
  *
  * Provides the command operserv/dns.
  *
+ * This module requires that m_dns is loaded.
+ *
  * This module allows controlling a DNS zone. This is useful for
  * controlling what servers users are placed on for load balancing,
  * and to automatically remove split servers.
@@ -371,6 +373,7 @@ defcon
  *
  * To do this using BIND, configure similar to:
  *
+ * options { max-refresh-time 60; };
  * zone "irc.example.com" IN {
  *   type slave;
  *   masters { 127.0.0.1 port 5353; };