svn commit: r337686 - in head: etc etc/newsyslog.conf.d usr.sbin/newsyslog usr.sbin/newsyslog/newsyslog.conf.d

[Brad Davis]

Author: brd
Date: Sun Aug 12 13:24:53 2018
New Revision: 337686
URL: https://svnweb.freebsd.org/changeset/base/337686

Log:
  Move all the newsyslog related configs to usr.sbin/newsyslog/
  
  This is related to pkgbase and changes these to use CONFS so that these are
  tagged as config files.
  
  Approved by:	AllanJude (mentor)
  Sponsored by:	Essen Hackathon
  Differential Revision:	https://reviews.freebsd.org/D16694

Added:
  head/usr.sbin/newsyslog/newsyslog.conf
     - copied unchanged from r337685, head/etc/newsyslog.conf
  head/usr.sbin/newsyslog/newsyslog.conf.d/
     - copied from r337685, head/etc/newsyslog.conf.d/
Deleted:
  head/etc/newsyslog.conf
  head/etc/newsyslog.conf.d/
Modified:
  head/etc/Makefile
  head/usr.sbin/newsyslog/Makefile
  head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sun Aug 12 12:58:05 2018	(r337685)
+++ head/etc/Makefile	Sun Aug 12 13:24:53 2018	(r337686)
@@ -31,7 +31,6 @@ BIN1=	crontab \
 	motd \
 	netconfig \
 	networks \
-	newsyslog.conf \
 	nsswitch.conf \
 	phones \
 	profile \
@@ -170,7 +169,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
-	${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt

Modified: head/usr.sbin/newsyslog/Makefile
==============================================================================
--- head/usr.sbin/newsyslog/Makefile	Sun Aug 12 12:58:05 2018	(r337685)
+++ head/usr.sbin/newsyslog/Makefile	Sun Aug 12 13:24:53 2018	(r337686)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+CONFS=	newsyslog.conf
 PROG=	newsyslog
 MAN=	newsyslog.8 newsyslog.conf.5
 SRCS=	newsyslog.c ptimes.c
@@ -9,5 +10,6 @@ LIBADD=	sbuf
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
+SUBDIR+=	newsyslog.conf.d
 
 .include <bsd.prog.mk>

Copied: head/usr.sbin/newsyslog/newsyslog.conf (from r337685, head/etc/newsyslog.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/newsyslog/newsyslog.conf	Sun Aug 12 13:24:53 2018	(r337686, copy of r337685, head/etc/newsyslog.conf)
@@ -0,0 +1,35 @@
+# configuration file for newsyslog
+# $FreeBSD$
+#
+# Entries which do not specify the '/pid_file' field will cause the
+# syslogd process to be signalled when that log file is rotated.  This
+# action is only appropriate for log files which are written to by the
+# syslogd process (ie, files listed in /etc/syslog.conf).  If there
+# is no process which needs to be signalled when a given log file is
+# rotated, then the entry for that file should include the 'N' flag.
+#
+# Note: some sites will want to select more restrictive protections than the
+# defaults.  In particular, it may be desirable to switch many of the 644
+# entries to 640 or 600.  For example, some sites will consider the
+# contents of maillog, messages, and lpd-errs to be confidential.  In the
+# future, these defaults may change to more conservative ones.
+#
+# logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
+/var/log/all.log			600  7	   *	@T00  J
+/var/log/auth.log			600  7     1000 @0101T JC
+/var/log/console.log			600  5	   1000	*     J
+/var/log/cron				600  3	   1000	*     JC
+/var/log/daily.log			640  7	   *	@T00  JN
+/var/log/debug.log			600  7     1000 *     JC
+/var/log/init.log			644  3	   1000	*     J
+/var/log/kerberos.log			600  7	   1000	*     J
+/var/log/maillog			640  7	   *	@T00  JC
+/var/log/messages			644  5	   1000	@0101T JC
+/var/log/monthly.log			640  12	   *	$M1D0 JN
+/var/log/devd.log			644  3	   1000	*     JC
+/var/log/security			600  10	   1000	*     JC
+/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/*

Modified: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
==============================================================================
--- head/etc/newsyslog.conf.d/Makefile	Sun Aug 12 12:58:05 2018	(r337685)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile	Sun Aug 12 13:24:53 2018	(r337686)
@@ -2,36 +2,36 @@
 
 .include <src.opts.mk>
 
-BINDIR=		/etc/newsyslog.conf.d
+CONFSDIR=	/etc/newsyslog.conf.d
 
-FILES=
+CONFS=
 
 .if ${MK_AMD} != "no"
-FILES+=		amd.conf
+CONFS+=		amd.conf
 .endif
 
 .if ${MK_FTP} != "no"
-FILES+=		ftp.conf
+CONFS+=		ftp.conf
 .endif
 
 .if ${MK_LPR} != "no"
-FILES+=		lpr.conf
+CONFS+=		lpr.conf
 .endif
 
 .if ${MK_OFED} != "no"
-FILES+=		opensm.conf
+CONFS+=		opensm.conf
 .endif
 
 .if ${MK_PF} != "no"
-FILES+=		pf.conf
+CONFS+=		pf.conf
 .endif
 
 .if ${MK_PPP} != "no"
-FILES+=		ppp.conf
+CONFS+=		ppp.conf
 .endif
 
 .if ${MK_SENDMAIL} != "no"
-FILES+=		sendmail.conf
+CONFS+=		sendmail.conf
 .endif
 
 .include <bsd.prog.mk>