svn commit: r266463 - in head: etc etc/mtree usr.sbin/newsyslog

[Bryan Drewery]

Author: bdrewery
Date: Tue May 20 03:00:20 2014
New Revision: 266463
URL: http://svnweb.freebsd.org/changeset/base/266463

Log:
  - Include /etc/newsyslog.conf.d/* and /usr/local/etc/newsyslog.conf.d/* by
    default for newsyslog(8).
  
    The /usr/local/etc/newsyslog.conf.d will give packages an opportunity to
    install a default configuration to handle their own log files.
  
  MFC after:	2 weeks
  Relnotes:	yes

Modified:
  head/etc/mtree/BSD.root.dist
  head/etc/newsyslog.conf
  head/usr.sbin/newsyslog/newsyslog.8

Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist	Tue May 20 02:59:13 2014	(r266462)
+++ head/etc/mtree/BSD.root.dist	Tue May 20 03:00:20 2014	(r266463)
@@ -42,6 +42,8 @@
         ..
         mtree
         ..
+        newsyslog.conf.d
+        ..
         ntp             mode=0700
         ..
         pam.d

Modified: head/etc/newsyslog.conf
==============================================================================
--- head/etc/newsyslog.conf	Tue May 20 02:59:13 2014	(r266462)
+++ head/etc/newsyslog.conf	Tue May 20 03:00:20 2014	(r266463)
@@ -38,3 +38,6 @@
 /var/log/utx.log			644  3	   *	@01T05 B
 /var/log/weekly.log			640  5	   *	$W6D0 JN
 /var/log/xferlog			600  7	   100	*     JC
+
+<include> /etc/newsyslog.conf.d/*
+<include> /usr/local/etc/newsyslog.conf.d/*

Modified: head/usr.sbin/newsyslog/newsyslog.8
==============================================================================
--- head/usr.sbin/newsyslog/newsyslog.8	Tue May 20 02:59:13 2014	(r266462)
+++ head/usr.sbin/newsyslog/newsyslog.8	Tue May 20 03:00:20 2014	(r266463)
@@ -17,7 +17,7 @@
 .\" the suitability of this software for any purpose.  It is
 .\" provided "as is" without express or implied warranty.
 .\"
-.Dd January 31, 2011
+.Dd May 19, 2014
 .Dt NEWSYSLOG 8
 .Os
 .Sh NAME
@@ -261,10 +261,16 @@ If additional command line arguments are
 will only examine log files that match those arguments; otherwise, it
 will examine all files listed in the configuration file.
 .Sh FILES
-.Bl -tag -width /etc/newsyslog.confxxxx -compact
+.Bl -tag -width /usr/local/etc/newsyslog.conf.d -compact
 .It Pa /etc/newsyslog.conf
 .Nm
 configuration file
+.It Pa /etc/newsyslog.conf.d
+Each file in this directory 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
+.Pa newsyslog.conf .
 .El
 .Sh COMPATIBILITY
 Previous versions of the