diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2014-11-06 21:47:02 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2014-11-06 21:59:04 +0100 |
commit | 71f64ded0698688393dc810115cd29456a5a1328 (patch) | |
tree | bfbeceed28632a61b03c93309247cf73353fac39 /nixos/modules/services/logging | |
parent | 2b3c3d0e321e67f7e187254a2c26147c8c57bacf (diff) | |
download | nixlib-71f64ded0698688393dc810115cd29456a5a1328.tar nixlib-71f64ded0698688393dc810115cd29456a5a1328.tar.gz nixlib-71f64ded0698688393dc810115cd29456a5a1328.tar.bz2 nixlib-71f64ded0698688393dc810115cd29456a5a1328.tar.lz nixlib-71f64ded0698688393dc810115cd29456a5a1328.tar.xz nixlib-71f64ded0698688393dc810115cd29456a5a1328.tar.zst nixlib-71f64ded0698688393dc810115cd29456a5a1328.zip |
Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
This reverts commit 8e1072fd60f9dcf5eac0bb2d604258f121b658d8.
Diffstat (limited to 'nixos/modules/services/logging')
-rw-r--r-- | nixos/modules/services/logging/syslog-ng.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index f3991a411ec4..2bf6d1ff7904 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -43,15 +43,6 @@ in { The package providing syslog-ng binaries. ''; }; - listenToJournal = mkOption { - type = types.bool; - default = true; - description = '' - Whether syslog-ng should listen to the syslog socket used - by journald, and therefore receive all logs that journald - produces. - ''; - }; extraModulePaths = mkOption { type = types.listOf types.str; default = []; @@ -74,7 +65,7 @@ in { configHeader = mkOption { type = types.lines; default = '' - @version: 3.5 + @version: 3.6 @include "scl.conf" ''; description = '' @@ -86,18 +77,13 @@ in { }; config = mkIf cfg.enable { - systemd.sockets.syslog = mkIf cfg.listenToJournal { - wantedBy = [ "sockets.target" ]; - socketConfig.Service = "syslog-ng.service"; - }; systemd.services.syslog-ng = { description = "syslog-ng daemon"; preStart = "mkdir -p /{var,run}/syslog-ng"; - wantedBy = optional (!cfg.listenToJournal) "multi-user.target"; + wantedBy = [ "multi-user.target" ]; after = [ "multi-user.target" ]; # makes sure hostname etc is set serviceConfig = { Type = "notify"; - Sockets = if cfg.listenToJournal then "syslog.socket" else null; StandardOutput = "null"; Restart = "on-failure"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; |