summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-06-05 15:21:25 +0000
committerbdrewery <bdrewery@FreeBSD.org>2014-06-05 15:21:25 +0000
commitc2e2f22c39a3af34517cf2315846784fa0152bf9 (patch)
tree0e056e1e0dce040d37918d19ec59887aada30dc3 /etc
parent6f5c5395e9e213b5ff6a372a655235871d992b67 (diff)
downloadFreeBSD-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).
Diffstat (limited to 'etc')
-rw-r--r--etc/mtree/BSD.root.dist2
-rw-r--r--etc/newsyslog.conf3
2 files changed, 5 insertions, 0 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/*
OpenPOWER on IntegriCloud