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, 19 deletions

diff --git a/data/global.example.conf b/data/global.example.conf
index 2ae7cdc99..b013537d6 100644
--- a/data/global.example.conf
+++ b/data/global.example.conf
@@ -56,38 +56,30 @@ service
  *
  * Provides essential functionality for Global.
  */
-module { name = "global" }
-
-/*
- * Configuration for Global provided by gl_main.
- */
-global
+module
 {
+	name = "global"
+
 	/*
 	 * The name of the client that should be Global.
 	 */
-	name = "Global"
+	client = "Global"
 
 	/*
-	 * If set, Services will send global messages on starting up and shutting
-	 * down/restarting.
+	 * This is the global message that will be sent when Services are being
+	 * shutdown/restarted.
 	 *
 	 * This directive is optional.
 	 */
-	#globaloncycle = yes
-
-	/*
-	 * This is the global message that will be sent when Services are being
-	 * shutdown/restarted. This directive is only required if you enable
-	 * globaloncycle above.
-	 */
-	globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
 
 	/*
 	 * This is the global message that will be sent when Services (re)join the
-	 * network. This directive is only required if you enable globaloncycle above.
+	 * network.
+	 *
+	 * This directive is optional.
 	 */
-	globaloncycleup = "Services are now back online - have a nice day"
+	#globaloncycleup = "Services are now back online - have a nice day"
 
 	/*
 	 * If set, Services will hide the IRC Operator's nick in a global