aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/newsyslog/newsyslog.88
-rw-r--r--usr.sbin/newsyslog/newsyslog.conf4
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index e06791d58929..a85f8ac7054a 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 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 file.
.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
diff --git a/usr.sbin/newsyslog/newsyslog.conf b/usr.sbin/newsyslog/newsyslog.conf
index 51ac310ed443..43528a9a2b16 100644
--- a/usr.sbin/newsyslog/newsyslog.conf
+++ b/usr.sbin/newsyslog/newsyslog.conf
@@ -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