packages: syslog-ng/syslog-ng-simple.conf, syslog-ng/syslog-ng-systemd.patc...

baggins baggins at pld-linux.org
Tue Apr 17 18:01:26 CEST 2012 

Author: baggins                      Date: Tue Apr 17 16:01:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.3.5
- fix configs for systemd >= 38 with systemd-journal
- set syslog alias in config file instead of manually symlinking it

---- Files affected:
packages/syslog-ng:
   syslog-ng-simple.conf (1.3 -> 1.4) , syslog-ng-systemd.patch (1.1 -> 1.2) , syslog-ng.conf (1.36 -> 1.37) , syslog-ng.spec (1.247 -> 1.248) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng-simple.conf
diff -u packages/syslog-ng/syslog-ng-simple.conf:1.3 packages/syslog-ng/syslog-ng-simple.conf:1.4
--- packages/syslog-ng/syslog-ng-simple.conf:1.3	Thu Jun 25 10:08:17 2009
+++ packages/syslog-ng/syslog-ng-simple.conf	Tue Apr 17 18:01:20 2012
@@ -21,15 +21,20 @@
 
 source s_kernel { file ("/proc/kmsg" program_override("kernel: ")); };
 source s_src    { unix-stream("/dev/log"); internal(); };
+# if using systemd, comment out the two lines above, and uncomment line below
+#source s_src	{ unix-dgram("/run/systemd/journal/syslog"); internal(); };
 
 destination d_mail        { file("/var/log/maillog"); };
 destination d_messages    { file("/var/log/messages"); };
 destination d_kernel      { file("/var/log/kernel"); };
 destination d_console_all { file("/dev/tty12"); };
 
+filter f_kern             { facility(kern); };
 filter f_mail             { facility(mail); };
 
 log { source(s_kernel); destination(d_kernel); };
+# if using systemd, comment out the line above, and uncomment line below
+#log { source(s_src); filter(f_kern); destination(d_kernel); };
 log { source(s_src); destination(d_console_all); };
 log { source(s_src); filter(f_mail); destination(d_mail); };
 log { source(s_src); destination(d_messages); flags(fallback); };

================================================================
Index: packages/syslog-ng/syslog-ng-systemd.patch
diff -u packages/syslog-ng/syslog-ng-systemd.patch:1.1 packages/syslog-ng/syslog-ng-systemd.patch:1.2
--- packages/syslog-ng/syslog-ng-systemd.patch:1.1	Tue Nov 29 18:27:39 2011
+++ packages/syslog-ng/syslog-ng-systemd.patch	Tue Apr 17 18:01:20 2012
@@ -1,14 +1,18 @@
 --- syslog-ng-3.3.1/contrib/systemd/syslog-ng.service~	2011-09-09 09:14:53.000000000 +0200
 +++ syslog-ng-3.3.1/contrib/systemd/syslog-ng.service	2011-11-29 18:24:53.010449488 +0100
-@@ -2,9 +2,10 @@
+@@ -2,11 +2,13 @@
  Description=System Logger Daemon
  
  [Service]
-+EnvironmentFile=/etc/sysconfig/syslog-ng
++EnvironmentFile=-/etc/sysconfig/syslog-ng
  Sockets=syslog.socket
- ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
 -ExecStart=/usr/sbin/syslog-ng -F
++ExecStartPre=-/bin/systemctl stop systemd-kmsg-syslogd.service
 +ExecStart=/sbin/syslog-ng -F -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024
  ExecReload=/bin/kill -HUP $MAINPID
  StandardOutput=null
  
+ [Install]
+ WantedBy=multi-user.target
++Alias=syslog.service

================================================================
Index: packages/syslog-ng/syslog-ng.conf
diff -u packages/syslog-ng/syslog-ng.conf:1.36 packages/syslog-ng/syslog-ng.conf:1.37
--- packages/syslog-ng/syslog-ng.conf:1.36	Sun Nov 13 07:00:44 2011
+++ packages/syslog-ng/syslog-ng.conf	Tue Apr 17 18:01:20 2012
@@ -24,12 +24,15 @@
 source s_sys	{
 	file ("/proc/kmsg" program_override("kernel"));
 	unix-stream("/dev/log" max-connections(1000) log_iw_size(100000));
+# if using systemd, comment out the two line above, and uncomment line below
+#	unix-dgram("/run/systemd/journal/syslog");
 	internal();
 };
 
 # uncomment the line below if you want to setup syslog server
 #source s_net	{ udp(); };
 
+# if using systemd, an IP address instead of name may be required here
 #destination d_loghost	{ udp("loghost" port(514)); };
 
 destination d_kern	{ file("/var/log/kernel"); };

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.247 packages/syslog-ng/syslog-ng.spec:1.248
--- packages/syslog-ng/syslog-ng.spec:1.247	Sun Apr  1 16:50:08 2012
+++ packages/syslog-ng/syslog-ng.spec	Tue Apr 17 18:01:20 2012
@@ -25,12 +25,12 @@
 Summary(pl.UTF-8):	Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	3.3.4
-Release:	9
+Version:	3.3.5
+Release:	0.1
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 Source0:	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
-# Source0-md5:	8e1bc6bb55a6545dcf0329b982c82a44
+# Source0-md5:	a69e725854301ecda26dbe51f3a10645
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
@@ -76,6 +76,7 @@
 %endif
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 0.38
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	eventlog >= 0.2.12
 Requires:	glib2 >= %{glib2_ver}
@@ -341,7 +342,6 @@
 %service syslog-ng restart "syslog-ng daemon"
 
 %systemd_post syslog-ng.service
-ln -sf /lib/systemd/system/syslog-ng.service /etc/systemd/system/syslog.service || :
 
 %preun
 if [ "$1" = "0" ]; then
@@ -492,6 +492,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.248  2012/04/17 16:01:20  baggins
+- 3.3.5
+- fix configs for systemd >= 38 with systemd-journal
+- set syslog alias in config file instead of manually symlinking it
+
 Revision 1.247  2012/04/01 14:50:08  glen
 - release 9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng-simple.conf?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng-systemd.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng.conf?r1=1.36&r2=1.37
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng.spec?r1=1.247&r2=1.248

More information about the pld-cvs-commit mailing list