diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2013-06-02 01:18:36 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-06-02 01:18:36 +0000 |
| commit | 6355e08e21d9bd26c39642d0b909f5ee19fd481a (patch) | |
| tree | 9223e1e5d212a85daa8808432aa8c78fbe49112c /app-admin/syslog-ng/files | |
| parent | support building on 64bit platform, bug#425030 (diff) | |
| download | gentoo-2-6355e08e21d9bd26c39642d0b909f5ee19fd481a.tar.gz gentoo-2-6355e08e21d9bd26c39642d0b909f5ee19fd481a.tar.bz2 gentoo-2-6355e08e21d9bd26c39642d0b909f5ee19fd481a.zip | |
rev bump to force out default config changes (bug #471836)
restrict tests again (bug #471988)
remove hardened and selinux use flags (bug #375853)
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-admin/syslog-ng/files')
| -rw-r--r-- | app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo | 9 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd | 8 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/README.hardened | 13 |
3 files changed, 17 insertions, 13 deletions
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo index 241856071670..e8d3b4f1d596 100644 --- a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo +++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo @@ -1,5 +1,5 @@ @version: 3.4 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ # # Syslog-ng default configuration file for Gentoo Linux @@ -22,12 +22,7 @@ options { mark_freq(3600); }; -source src { - # https://bugs.gentoo.org/show_bug.cgi?id=449260 - unix-dgram("/dev/log"); - internal(); - file("/proc/kmsg"); -}; +source src { system(); internal(); }; destination messages { file("/var/log/messages"); }; diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd index e255b8b91eff..66130bea1de4 100644 --- a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd +++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd @@ -1,5 +1,5 @@ @version: 3.4 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ # # Syslog-ng default configuration file for Gentoo FreeBSD # @@ -18,11 +18,7 @@ options { stats_freq(43200); }; -source src { - unix-dgram("/var/run/log"); - internal(); - file("/dev/klog"); -}; +source src { system(); internal(); }; destination messages { file("/var/log/messages"); }; diff --git a/app-admin/syslog-ng/files/README.hardened b/app-admin/syslog-ng/files/README.hardened new file mode 100644 index 000000000000..dcb0fc3f3ae2 --- /dev/null +++ b/app-admin/syslog-ng/files/README.hardened @@ -0,0 +1,13 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +If you intend to use syslog-ng together with the systemd journal, +please be sure to configure it to listen accordingly, e.g. replace + + unix-dgram("/dev/log"); + +with + + unix-dgram("/run/systemd/journal/syslog"); + +in /etc/syslog-ng/syslog-ng.conf |