- rel 3

- fix systemd comments in configs (man systemd-journald.conf ; /ImportKernel)

Changed files:
    syslog-ng-simple.conf -> 1.5
    syslog-ng.conf -> 1.38
    syslog-ng.spec -> 1.251

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index f42106f91b3188f02ed13a72133aad3ee50d101c..34491ce74b0b725fb37b9c4faea6afb987fc31e1 100644 (file)
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -19,9 +19,9 @@ options {
        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_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); };

diff --git a/syslog-ng.conf b/syslog-ng.conf
index f8110b307f3dd1628c963516b5d6ba1d97d9bade..f6faeec54fd7275547a1c8447e6fb1cd3da88e91 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -24,7 +24,7 @@ options {
 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();
 };

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 1f684ccd4ea4a0e1e95358ab9ff23646cef0051a..49c7f0c64f3a065d339a970ebdeac88d3704ec32 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -25,7 +25,7 @@ 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.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