aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2018-08-21 17:01:47 +0000
committerBrad Davis <brd@FreeBSD.org>2018-08-21 17:01:47 +0000
commit64be79ef76069b725c6c7a7b22425642b77a927a (patch)
tree540732d798e8aca25e7b62427f22e6cf3734c733 /etc
parentcd4d034fd6b43cfad810b3834dedb75788b3791c (diff)
downloadsrc-64be79ef76069b725c6c7a7b22425642b77a927a.tar.gz
src-64be79ef76069b725c6c7a7b22425642b77a927a.zip
Move all syslogd related configs to usr.sbin/syslogd/
This helps with pkgbase as it switches these to use CONFS which properly tags them as config files. Approved by: will (mentor) Differential Revision: https://reviews.freebsd.org/D16783
Notes
Notes: svn path=/head/; revision=338146
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile2
-rw-r--r--etc/syslog.conf34
-rw-r--r--etc/syslog.d/Makefile19
-rw-r--r--etc/syslog.d/ftp.conf2
-rw-r--r--etc/syslog.d/lpr.conf2
-rw-r--r--etc/syslog.d/ppp.conf3
6 files changed, 0 insertions, 62 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 738b389e2e6f..c17f08996c30 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -38,7 +38,6 @@ BIN1= crontab \
remote \
rpc \
services \
- syslog.conf \
termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
@@ -154,7 +153,6 @@ distribution:
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
- ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
.if ${MK_UNBOUND} != "no"
diff --git a/etc/syslog.conf b/etc/syslog.conf
deleted file mode 100644
index e0df421b9021..000000000000
--- a/etc/syslog.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-#
-# Spaces ARE valid field separators in this file. However,
-# other *nix-like systems still insist on using tabs as field
-# separators. If you are sharing this file between systems, you
-# may want to use only tabs as field separators here.
-# Consult the syslog.conf(5) manpage.
-*.err;kern.warning;auth.notice;mail.crit /dev/console
-*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages
-security.* /var/log/security
-auth.info;authpriv.info /var/log/auth.log
-mail.info /var/log/maillog
-cron.* /var/log/cron
-!-devd
-*.=debug /var/log/debug.log
-*.emerg *
-# uncomment this to log all writes to /dev/console to /var/log/console.log
-# touch /var/log/console.log and chmod it to mode 600 before it will work
-#console.info /var/log/console.log
-# uncomment this to enable logging of all log messages to /var/log/all.log
-# touch /var/log/all.log and chmod it to mode 600 before it will work
-#*.* /var/log/all.log
-# uncomment this to enable logging to a remote loghost named loghost
-#*.* @loghost
-# uncomment these if you're running inn
-# news.crit /var/log/news/news.crit
-# news.err /var/log/news/news.err
-# news.notice /var/log/news/news.notice
-# Uncomment this if you wish to see messages produced by devd
-# !devd
-# *.>=notice /var/log/devd.log
-!*
-include /etc/syslog.d
-include /usr/local/etc/syslog.d
diff --git a/etc/syslog.d/Makefile b/etc/syslog.d/Makefile
deleted file mode 100644
index 56047ed2bfba..000000000000
--- a/etc/syslog.d/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-.if ${MK_FTP} != "no"
-FILES+= ftp.conf
-.endif
-
-.if ${MK_LPR} != "no"
-FILES+= lpr.conf
-.endif
-
-.if ${MK_PPP} != "no"
-FILES+= ppp.conf
-.endif
-
-BINDIR= /etc/syslog.d
-
-.include <bsd.prog.mk>
diff --git a/etc/syslog.d/ftp.conf b/etc/syslog.d/ftp.conf
deleted file mode 100644
index d4d11cfb7a65..000000000000
--- a/etc/syslog.d/ftp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $FreeBSD$
-ftp.info /var/log/xferlog
diff --git a/etc/syslog.d/lpr.conf b/etc/syslog.d/lpr.conf
deleted file mode 100644
index 0eb6eb06db2a..000000000000
--- a/etc/syslog.d/lpr.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $FreeBSD$
-lpr.info /var/log/lpd-errs
diff --git a/etc/syslog.d/ppp.conf b/etc/syslog.d/ppp.conf
deleted file mode 100644
index 57ee868bd142..000000000000
--- a/etc/syslog.d/ppp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-!ppp
-*.* /var/log/ppp.log