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

[baggins]

Author: baggins                      Date: Mon Apr 23 06:25:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- fix systemd comments in configs (man systemd-journald.conf ; /ImportKernel)

---- Files affected:
packages/syslog-ng:
   syslog-ng-simple.conf (1.4 -> 1.5) , syslog-ng.conf (1.37 -> 1.38) , syslog-ng.spec (1.250 -> 1.251) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng-simple.conf
diff -u packages/syslog-ng/syslog-ng-simple.conf:1.4 packages/syslog-ng/syslog-ng-simple.conf:1.5
--- packages/syslog-ng/syslog-ng-simple.conf:1.4	Tue Apr 17 18:01:20 2012
+++ packages/syslog-ng/syslog-ng-simple.conf	Mon Apr 23 08:25:27 2012
@@ -19,9 +19,9 @@
 	stats_freq(43200);
 };
 
-source s_kernel { file ("/proc/kmsg" program_override("kernel: ")); };
+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
+# if using systemd, comment out the line above, and uncomment line below
 #source s_src	{ unix-dgram("/run/systemd/journal/syslog"); internal(); };
 
 destination d_mail        { file("/var/log/maillog"); };
@@ -33,8 +33,6 @@
 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.conf
diff -u packages/syslog-ng/syslog-ng.conf:1.37 packages/syslog-ng/syslog-ng.conf:1.38
--- packages/syslog-ng/syslog-ng.conf:1.37	Tue Apr 17 18:01:20 2012
+++ packages/syslog-ng/syslog-ng.conf	Mon Apr 23 08:25:27 2012
@@ -24,7 +24,7 @@
 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
+# if using systemd, comment out the line above, and uncomment line below
 #	unix-dgram("/run/systemd/journal/syslog");
 	internal();
 };

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.250 packages/syslog-ng/syslog-ng.spec:1.251
--- packages/syslog-ng/syslog-ng.spec:1.250	Fri Apr 20 12:36:24 2012
+++ packages/syslog-ng/syslog-ng.spec	Mon Apr 23 08:25:27 2012
@@ -26,7 +26,7 @@
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
 Version:	3.3.5
-Release:	2
+Release:	3
 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
@@ -492,6 +492,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251  2012/04/23 06:25:27  baggins
+- rel 3
+- fix systemd comments in configs (man systemd-journald.conf ; /ImportKernel)
+
 Revision 1.250  2012/04/20 10:36:24  baggins
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng-simple.conf?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng.conf?r1=1.37&r2=1.38
    http://cvs.pld-linux.org/packages/syslog-ng/syslog-ng.spec?r1=1.250&r2=1.251