diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2014-10-27 12:20:57 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2014-10-27 12:22:22 +0100 |
commit | e2ada42623f26d51cf7d1253ac0700297e1a9b83 (patch) | |
tree | 81362d9c3db60291de1c3ee7ef19a615b48f511e /nixos | |
parent | 8b47b6732996891e5e8386cbd043fbc9c2224015 (diff) | |
download | nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.tar nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.tar.gz nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.tar.bz2 nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.tar.lz nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.tar.xz nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.tar.zst nixpkgs-e2ada42623f26d51cf7d1253ac0700297e1a9b83.zip |
syslog-ng: Update from 3.5.6 to 3.6.1
Also update the NixOS module, syslog-ng now automatically listens to the systemd journal, so we don't have to set up syslog.socket.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/logging/syslog-ng.nix | 18 |
2 files changed, 3 insertions, 16 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 073a2220765..ea7d9763ce6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -131,5 +131,6 @@ in zipModules ([] ++ obsolete' [ "programs" "bash" "enable" ] ++ obsolete' [ "services" "samba" "defaultShare" ] ++ obsolete' [ "services" "syslog-ng" "serviceName" ] +++ obsolete' [ "services" "syslog-ng" "listenToJournal" ] ) diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index f3991a411ec..2bf6d1ff790 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}"; |