[packages/syslog-ng] - up to 3.6.4; use system() as main source (automatically discovers systemd, that it's run in contai
arekm
arekm at pld-linux.org
Thu Sep 10 11:27:16 CEST 2015
commit 8730cf7ab550839393dafd9c8349ebe6d25aa890
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Sep 10 11:27:08 2015 +0200
- up to 3.6.4; use system() as main source (automatically discovers systemd, that it's run in container etc)
syslog-ng.conf | 9 +++------
syslog-ng.spec | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index d45594b..e46d236 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -32,8 +32,8 @@ 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.6.3
-Release: 0.1
+Version: 3.6.4
+Release: 1
License: GPL v2+ with OpenSSL exception
Group: Daemons
Source0: https://my.balabit.com/downloads/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
diff --git a/syslog-ng.conf b/syslog-ng.conf
index b56f628..2b5f6c9 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,5 @@
- at version: 3.5
+ at version: 3.6
+ at include "scl.conf"
#
# Syslog-ng configuration for PLD Linux
#
@@ -22,11 +23,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 line above, and uncomment line below
-# unix-dgram("/run/systemd/journal/syslog");
-# and add ForwardToSyslog=yes to /etc/systemd/journald.conf
+ system();
internal();
};
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/8730cf7ab550839393dafd9c8349ebe6d25aa890
More information about the pld-cvs-commit
mailing list