Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in.

1 files changed, 11 insertions, 41 deletions

diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index 1d406ef5b..10063ae7d 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -56,45 +56,14 @@ service
  *
  * Provides essential functionality for HostServ.
  */
-module { name = "hostserv" }
-
-/*
- * Configuration for HostServ provided by hs_main.
- */
-hostserv
+module
 {
-	/*
-	 * The name of the client that should be HostServ.
-	 */
-	name = "HostServ"
+	name = "hostserv"
 
 	/*
-	 * The characters allowed in a vHost. Changing this is not recommended unless
-	 * you know for sure your IRCd supports whatever characters you are wanting to use.
-	 * Telling services to set a vHost containing characters your IRCd disallows could
-	 * potentially break the IRCd and/or Services. Note these are 1 byte characters, so
-	 * UTF-8 characters will not work.
-	 *
-	 * It is recommended you DON'T change this.
-	 */
-	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
-
-	/*
-	 * If set to true, allows vHosts to not contain dots (.).
-	 * Newer IRCds generally do not have a problem with this, but the same warning as
-	 * vhost_chars applies.
-	 *
-	 * It is recommended you DON'T change this.
-	 */
-	allow_undotted_vhosts = false
-
-	/*
-	 * The characters that are not allowed to be at the very beginning or very ending
-	 * of a vHost. The same warning as vhost_chars applies.
-	 *
-	 * It is recommended you DON'T change this.
+	 * The name of the client that should be HostServ.
 	 */
-	disallow_start_or_end = ".-"
+	client = "HostServ"
 }
 
 /*
@@ -169,13 +138,10 @@ command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
  *
  * Used to manage vHosts requested by users.
  */
-module { name = "hs_request" }
-command { service = "HostServ"; name = "REQUEST"; command = "hostserv/request"; }
-command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set"; }
-hs_request
+module
 {
+	name = "hs_request"
+
 	/*
 	 * If set, Services will send a memo to the user requesting a vHost when it's been
 	 * approved or rejected.
@@ -187,6 +153,10 @@ hs_request
 	 */
 	#memooper = yes
 }
+command { service = "HostServ"; name = "REQUEST"; command = "hostserv/request"; }
+command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/set"; }
+command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/set"; }
+command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set"; }
 
 /*
  * hs_set