ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""

Browse Source 
This reverts commit 8e1072fd60.
This commit is contained in:
Rickard Nilsson 2014-11-06 21:47:02 +01:00
parent 2b3c3d0e32
commit 71f64ded06
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

@ -131,5 +131,6 @@ in zipModules ([]
++ obsolete' [ "programs" "bash" "enable" ] ++ obsolete' [ "programs" "bash" "enable" ]
++ obsolete' [ "services" "samba" "defaultShare" ] ++ obsolete' [ "services" "samba" "defaultShare" ]
++ obsolete' [ "services" "syslog-ng" "serviceName" ] ++ obsolete' [ "services" "syslog-ng" "serviceName" ]
++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
) )

18
nixos/modules/services/logging/syslog-ng.nix
View File

@ -43,15 +43,6 @@ in {
The package providing syslog-ng binaries. 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 { extraModulePaths = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [];
@ -74,7 +65,7 @@ in {
configHeader = mkOption { configHeader = mkOption {
type = types.lines; type = types.lines;
default = '' default = ''
@version: 3.5 @version: 3.6
@include "scl.conf" @include "scl.conf"
''; '';
description = '' description = ''
@ -86,18 +77,13 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.sockets.syslog = mkIf cfg.listenToJournal {
wantedBy = [ "sockets.target" ];
socketConfig.Service = "syslog-ng.service";
};
systemd.services.syslog-ng = { systemd.services.syslog-ng = {
description = "syslog-ng daemon"; description = "syslog-ng daemon";
preStart = "mkdir -p /{var,run}/syslog-ng"; 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 after = [ "multi-user.target" ]; # makes sure hostname etc is set
serviceConfig = { serviceConfig = {
Type = "notify"; Type = "notify";
Sockets = if cfg.listenToJournal then "syslog.socket" else null;
StandardOutput = "null"; StandardOutput = "null";
Restart = "on-failure"; Restart = "on-failure";
ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; ExecStart = "${cfg.package}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}";

9
pkgs/tools/system/syslog-ng/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
, riemann_c_client, protobufc, yacc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "syslog-ng-${version}"; name = "syslog-ng-${version}";
version = "3.5.6"; version = "3.6.1";
src = fetchurl { src = fetchurl {
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7";
}; };
buildInputs = [ eventlog pkgconfig glib python systemd perl ]; buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ];
configureFlags = [ configureFlags = [
"--enable-dynamic-linking" "--enable-dynamic-linking"