alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

syslogd: extended configuration options

Browse source 
This commit adds the option 'services.syslogd.defaultConfig', which is
the main syslog.conf file used by the daemon. Like before, That file can
be extended by means of 'services.syslogd.extraConfig'. Users who want a
completely different configuration, however, can re-define defaultConfig
to their liking.

Furthermore, the option services.syslogd.tty' is now optional: setting
its value to the empty string "" disables logging to TTY altogether.

svn path=/nixos/trunk/; revision=27769
This commit is contained in:
Peter Simons 2011-07-13 18:24:53 +00:00
parent fb1b0c0372
commit d7c4900420
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/services/logging/syslogd.nix
View file

@ -4,9 +4,15 @@ with pkgs.lib;
let
syslogConf = pkgs.writeText "syslog.conf" ''
kern.warning;*.err;authpriv.none /dev/${config.services.syslogd.tty}
cfg = config.services.syslogd;
syslogConf = pkgs.writeText "syslog.conf" ''
${if (cfg.tty != "") then "kern.warning;*.err;authpriv.none /dev/${cfg.tty}" else ""}
${cfg.defaultConfig}
${cfg.extraConfig}
'';
defaultConf = ''
# Send emergency messages to all users.
*.emerg *
@ -19,10 +25,7 @@ let
*.crit /var/log/warn
*.*;mail.none;local1.none -/var/log/messages
${config.services.syslogd.extraConfig}
'';
in
{
@ -33,18 +36,31 @@ in
services.syslogd = {
tty = mkOption {
type = types.string;
default = "tty10";
description = ''
The tty device on which syslogd will print important log
messages.
messages. Leave this option blank to disable tty logging.
'';
};
defaultConfig = mkOption {
type = types.string;
default = defaultConf;
description = ''
The default <filename>syslog.conf</filename> file configures a
fairly standard setup of log files, which can be extended by
means of <varname>extraConfig</varname>.
'';
};
extraConfig = mkOption {
type = types.string;
default = "";
example = "news.* -/var/log/news";
description = ''
Additional text appended to <filename>syslog.conf</filename>.
Additional text appended to <filename>syslog.conf</filename>,
i.e. the contents of <varname>defaultConfig</varname>.
'';
};