From b4c8e74ccb2cb95e492323b8b39950b203e0262f Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sun, 21 Jan 2024 19:41:39 +0100 Subject: Use a default "IncludeDir" only when no config file was specified No longer use a default built-in value for the "IncludeDir" directive when a configuration file was explicitly specified on the command line using "--config"/"-f": This way no default include directory is scanned when a possibly non-default configuration file is used which (intentionally) did not specify an "IncludeDir" directive. With this patch you now can use "-f /dev/null" for checking all built-in defaults, regardless of any local configuration files in the default drop-in directory (which would have been read in until this change). --- doc/sample-ngircd.conf.tmpl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'doc/sample-ngircd.conf.tmpl') diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 79360869..d59b139b 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -35,7 +35,8 @@ ;AdminEMail = admin@irc.server # Text file which contains the ngIRCd help text. This file is required - # to display help texts when using the "HELP " command. + # to display help texts when using the "HELP " command. Default: a + # built-in standard path (check "ngircd --configtest"). ;HelpFile = :DOCDIR:/Commands.txt # Info text of the server. This will be shown by WHOIS and @@ -50,7 +51,8 @@ ;Listen = 127.0.0.1,192.168.0.1 # Text file with the "message of the day" (MOTD). This message will - # be shown to all users connecting to the server: + # be shown to all users connecting to the server: Default: a built-in + # standard path (check "ngircd --configtest"). ;MotdFile = :ETCDIR:/ngircd.motd # A simple Phrase (<127 chars) if you don't want to use a motd file. @@ -194,6 +196,9 @@ # Directory containing configuration snippets (*.conf), that should # be read in after parsing this configuration file. + # Default: a built-in directory name when no configuration file was + # explicitly given on the command line (check "ngircd --configtest"), + # none (empty) otherwise. ;IncludeDir = :ETCDIR:/conf.d # Enhance user privacy slightly (useful for IRC server on TOR or I2P) -- cgit 1.4.1