diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-06-05 15:21:25 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-06-05 15:21:25 +0000 |
| commit | c2e2f22c39a3af34517cf2315846784fa0152bf9 (patch) | |
| tree | 0e056e1e0dce040d37918d19ec59887aada30dc3 | |
| parent | 6f5c5395e9e213b5ff6a372a655235871d992b67 (diff) | |
| download | FreeBSD-src-c2e2f22c39a3af34517cf2315846784fa0152bf9.zip FreeBSD-src-c2e2f22c39a3af34517cf2315846784fa0152bf9.tar.gz | |
MFC r266463:
- Include /etc/newsyslog.conf.d/* and /usr/local/etc/newsyslog.conf.d/* by
default for newsyslog(8).
| -rw-r--r-- | etc/mtree/BSD.root.dist | 2 | ||||
| -rw-r--r-- | etc/newsyslog.conf | 3 | ||||
| -rw-r--r-- | usr.sbin/newsyslog/newsyslog.8 | 10 |
3 files changed, 13 insertions, 2 deletions
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 86b93e1..5b91627 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -38,6 +38,8 @@ .. mtree .. + newsyslog.conf.d + .. ntp mode=0700 .. pam.d diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf index 9572f84..ab595ca 100644 --- a/etc/newsyslog.conf +++ b/etc/newsyslog.conf @@ -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/* diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8 index 87f60ac..e6d79a4 100644 --- a/usr.sbin/newsyslog/newsyslog.8 +++ b/usr.sbin/newsyslog/newsyslog.8 @@ -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 given, 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 |
