svn commit: r338146 - in head: etc etc/syslog.d usr.sbin/syslogd

[Brad Davis]

Author: brd
Date: Tue Aug 21 17:01:47 2018
New Revision: 338146
URL: https://svnweb.freebsd.org/changeset/base/338146

Log:
  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

Added:
  head/usr.sbin/syslogd/ftp.conf
     - copied unchanged from r338145, head/etc/syslog.d/ftp.conf
  head/usr.sbin/syslogd/lpr.conf
     - copied unchanged from r338145, head/etc/syslog.d/lpr.conf
  head/usr.sbin/syslogd/ppp.conf
     - copied unchanged from r338145, head/etc/syslog.d/ppp.conf
  head/usr.sbin/syslogd/syslog.conf
     - copied unchanged from r338145, head/etc/syslog.conf
Deleted:
  head/etc/syslog.conf
  head/etc/syslog.d/
Modified:
  head/etc/Makefile
  head/usr.sbin/syslogd/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Aug 21 16:52:14 2018	(r338145)
+++ head/etc/Makefile	Tue Aug 21 17:01:47 2018	(r338146)
@@ -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"

Modified: head/usr.sbin/syslogd/Makefile
==============================================================================
--- head/usr.sbin/syslogd/Makefile	Tue Aug 21 16:52:14 2018	(r338145)
+++ head/usr.sbin/syslogd/Makefile	Tue Aug 21 17:01:47 2018	(r338146)
@@ -5,6 +5,8 @@
 
 .PATH: ${SRCTOP}/usr.bin/wall
 
+CONFGROUPS=	CONFS SYSLOGD_D
+CONFS=	syslog.conf
 PROG=	syslogd
 MAN=	syslog.conf.5 syslogd.8
 SRCS=	syslogd.c ttymsg.c
@@ -16,6 +18,20 @@ CFLAGS+= -DINET
 .endif
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
+.endif
+
+SYSLOGD_D=
+SYSLOGD_DDIR=	/etc/syslog.d/
+.if ${MK_FTP} != "no"
+SYSLOGD_D+=	ftp.conf
+.endif
+
+.if ${MK_LPR} != "no"
+SYSLOGD_D+=	lpr.conf
+.endif
+
+.if ${MK_PPP} != "no"
+SYSLOGD_D+=	ppp.conf
 .endif
 
 CFLAGS+= -I${SRCTOP}/usr.bin/wall

Copied: head/usr.sbin/syslogd/ftp.conf (from r338145, head/etc/syslog.d/ftp.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/syslogd/ftp.conf	Tue Aug 21 17:01:47 2018	(r338146, copy of r338145, head/etc/syslog.d/ftp.conf)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+ftp.info					/var/log/xferlog

Copied: head/usr.sbin/syslogd/lpr.conf (from r338145, head/etc/syslog.d/lpr.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/syslogd/lpr.conf	Tue Aug 21 17:01:47 2018	(r338146, copy of r338145, head/etc/syslog.d/lpr.conf)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+lpr.info					/var/log/lpd-errs

Copied: head/usr.sbin/syslogd/ppp.conf (from r338145, head/etc/syslog.d/ppp.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/syslogd/ppp.conf	Tue Aug 21 17:01:47 2018	(r338146, copy of r338145, head/etc/syslog.d/ppp.conf)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+!ppp
+*.*						/var/log/ppp.log

Copied: head/usr.sbin/syslogd/syslog.conf (from r338145, head/etc/syslog.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/syslogd/syslog.conf	Tue Aug 21 17:01:47 2018	(r338146, copy of r338145, head/etc/syslog.conf)
@@ -0,0 +1,34 @@
+# $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