- 3.3.5

- fix configs for systemd >= 38 with systemd-journal
- set syslog alias in config file instead of manually symlinking it

Changed files:
    syslog-ng-simple.conf -> 1.4
    syslog-ng-systemd.patch -> 1.2
    syslog-ng.conf -> 1.37
    syslog-ng.spec -> 1.248

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index 0f4ea926a05016e44950c30d25ecfe731158b125..f42106f91b3188f02ed13a72133aad3ee50d101c 100644 (file)
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -21,15 +21,20 @@ options {
 
 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); };

diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index 809f8f2d52568413c8c321c868884ce90f98bcea..ac53e0732826e8dd14b79f9bbe01f897ea8995f0 100644 (file)
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -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

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 345d3076ebcca1ce7922bc737dbaaa02e0c3e127..f8110b307f3dd1628c963516b5d6ba1d97d9bade 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -24,12 +24,15 @@ 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
+#      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"); };

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 38ff80a7a7325282f1babfdad6028a5c69092537..aa45a47b13ff2c86dcf52b82e8b66eb5588f9661 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -24,12 +24,12 @@ Summary:    Syslog-ng - new generation of the system logger
 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
@@ -75,6 +75,7 @@ BuildRequires:        zlib-static
 %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}
@@ -340,7 +341,6 @@ fi
 %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