svn commit: r267114 - in stable/9: etc etc/mtree usr.sbin/newsyslog

[Bryan Drewery]

Author: bdrewery
Date: Thu Jun  5 15:33:09 2014
New Revision: 267114
URL: http://svnweb.freebsd.org/changeset/base/267114

Log:
  MFC r266463:
  
    - Include /etc/newsyslog.conf.d/* and /usr/local/etc/newsyslog.conf.d/* by
      default for newsyslog(8).
  
  Relnotes:	yes
  Approved by:	re (gjb)

Modified:
  stable/9/etc/mtree/BSD.root.dist
  stable/9/etc/newsyslog.conf
  stable/9/usr.sbin/newsyslog/newsyslog.8
Directory Properties:
  stable/9/etc/   (props changed)
  stable/9/etc/mtree/   (props changed)
  stable/9/usr.sbin/newsyslog/   (props changed)

Modified: stable/9/etc/mtree/BSD.root.dist
==============================================================================
--- stable/9/etc/mtree/BSD.root.dist	Thu Jun  5 15:21:25 2014	(r267113)
+++ stable/9/etc/mtree/BSD.root.dist	Thu Jun  5 15:33:09 2014	(r267114)
@@ -38,6 +38,8 @@
         ..
         mtree
         ..
+        newsyslog.conf.d
+        ..
         ntp             mode=0700
         ..
         pam.d

Modified: stable/9/etc/newsyslog.conf
==============================================================================
--- stable/9/etc/newsyslog.conf	Thu Jun  5 15:21:25 2014	(r267113)
+++ stable/9/etc/newsyslog.conf	Thu Jun  5 15:33:09 2014	(r267114)
@@ -36,3 +36,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: stable/9/usr.sbin/newsyslog/newsyslog.8
==============================================================================
--- stable/9/usr.sbin/newsyslog/newsyslog.8	Thu Jun  5 15:21:25 2014	(r267113)
+++ stable/9/usr.sbin/newsyslog/newsyslog.8	Thu Jun  5 15:33:09 2014	(r267114)
@@ -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