public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd: Make it work with systemd

Browse Source 
Also made syslogd optional (and disabled by default).
This commit is contained in:
Eelco Dolstra 2012-07-19 12:48:30 -04:00
parent 917e53a2d2
commit 425ec4cb00
1 changed files with 23 additions and 9 deletions

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

@ -36,6 +36,15 @@ in
services.syslogd = { services.syslogd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable syslogd. Note that systemd also logs
syslog messages, so you normally don't need to run syslogd.
'';
};
tty = mkOption { tty = mkOption {
type = types.uniq types.string; type = types.uniq types.string;
default = "tty10"; default = "tty10";
@ -89,22 +98,27 @@ in
###### implementation ###### implementation
config = { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.sysklogd ];
services.syslogd.extraParams = optional cfg.enableNetworkInput "-r"; services.syslogd.extraParams = optional cfg.enableNetworkInput "-r";
jobs.syslogd = boot.systemd.services."syslog.service" =
{ description = "Syslog daemon"; { description = "Syslog daemon";
#startOn = "started udev"; requires = [ "syslog.socket" ];
environment = { TZ = config.time.timeZone; }; wantedBy = [ "multi-user.target" "syslog.target" ];
daemonType = "fork"; environment.TZ = config.time.timeZone;
path = [ pkgs.sysklogd ]; serviceConfig =
''
exec = "syslogd ${toString cfg.extraParams} -f ${syslogConf}"; ExecStart=${pkgs.sysklogd}/sbin/syslogd ${toString cfg.extraParams} -f ${syslogConf} -n
# Prevent syslogd output looping back through journald.
StandardOutput=null
'';
}; };
}; };