Date: Sat, 10 Nov 2018 10:46:39 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340318 - head/usr.sbin/newsyslog Message-ID: <201811101046.wAAAkdPs041621@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 (ports committer) Date: Sat Nov 10 10:46:38 2018 New Revision: 340318 URL: https://svnweb.freebsd.org/changeset/base/340318 Log: newsyslog.conf: Restrict included files in default config to [!.]*.conf The new default config will only include files from the following directories which end with '.conf' and do not beginning with a '.' character: - /etc/newsyslog.conf.d/ - /usr/local/etc/newsyslog.conf.d/ This matches the syslog.conf(5) functionality, and also prevents '.sample' or '.pkgnew' files being included. This is important for ports which install files in /usr/local/etc/newsyslog.conf.d/ and also for pkgbase. Approved by: eadler Approved by: bapt Relnotes: yes Differential Revision: https://reviews.freebsd.org/D17086 Modified: head/usr.sbin/newsyslog/newsyslog.8 head/usr.sbin/newsyslog/newsyslog.conf Modified: head/usr.sbin/newsyslog/newsyslog.8 ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:32:55 2018 (r340317) +++ head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:46:38 2018 (r340318) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd July 19, 2018 +.Dd November 10, 2018 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -268,10 +268,12 @@ will examine all files listed in the configuration fil .Nm configuration file .It Pa /etc/newsyslog.conf.d -Each file in this directory will be included by the default +By default each file in this directory ending in '.conf' and not beginning with +a '.' will be included by the default .Pa newsyslog.conf . .It Pa /usr/local/etc/newsyslog.conf.d -Each file in this directory will be included by the default +By default each file in this directory ending in '.conf' and not beginning with +a '.' will be included by the default .Pa newsyslog.conf . .El .Sh COMPATIBILITY Modified: head/usr.sbin/newsyslog/newsyslog.conf ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:32:55 2018 (r340317) +++ head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:46:38 2018 (r340318) @@ -31,5 +31,5 @@ /var/log/utx.log 644 3 * @01T05 B /var/log/weekly.log 640 5 * $W6D0 JN -<include> /etc/newsyslog.conf.d/* -<include> /usr/local/etc/newsyslog.conf.d/* +<include> /etc/newsyslog.conf.d/[!.]*.conf +<include> /usr/local/etc/newsyslog.conf.d/[!.]*.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811101046.wAAAkdPs041621>