Removed log:inhabitlogchannel and replaced it with service:channels

8 files changed, 56 insertions, 7 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index e52a88943..c896aff0b 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index a108e2177..418f3ae86 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*
diff --git a/data/example.conf b/data/example.conf
index 4129b94db..72d06c3d5 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -617,7 +617,13 @@ log
 	 *   - globops
 	 */
 	target = "services.log"
-	/* Log to both services.log and the channel #services */
+
+	/* Log to both services.log and the channel #services
+	 * 
+	 * Note that some older IRCds, such as Ratbox, require services to be in the
+	 * log channel to be able to message it. To do this, configure service:channels to
+	 * join your logging channel.
+	 */
 	#target = "services.log #services"
 
 	/*
@@ -635,12 +641,6 @@ log
 	logage = 7
 
 	/*
-	 * Enable to have the core services clients join and stay in the log channel(s) when logging.
-	 * Note: on some IRCds this is not optional, and is enforced on.
-	 */
-	inhabitlogchannel = yes
-
-	/*
 	 * What types of log messages should be logged by this block. There are nine general categories:
 	 *
 	 *  admin      - Execution of admin commands (OperServ, etc).
diff --git a/data/global.example.conf b/data/global.example.conf
index 41f1c9463..fb10dd47c 100644
--- a/data/global.example.conf
+++ b/data/global.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*
diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index 45693f011..2edc68e1c 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*
diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf
index 181ee66d1..a0b16271a 100644
--- a/data/memoserv.example.conf
+++ b/data/memoserv.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index c7dbaa68f..dfa3bf542 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index bd922e92e..ad239dd3e 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -39,6 +39,13 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
+
+	/*
+	 * An optional comma separated list of channels this service should join. Outside
+	 * of log channels this is not very useful, as the service will just idle in the
+	 * specified channels, and will not accept any types of commands.
+	 */
+	#channels = "@#services,#mychan"
 }
 
 /*