Move all periodic related config and scripts to usr.sbin/periodic/

This makes pkgbase easier by tagging these as CONFS so they are properly
tagged as config files.

Approved by:	will (mentor)
Sponsored by:	Essen Hackathon
Differential Revision:	https://reviews.freebsd.org/D16553
This commit is contained in:
Brad Davis 2018-08-11 17:11:08 +00:00
parent 9317ba2226
commit 81ea85a884
64 changed files with 35 additions and 31 deletions

View File

@ -178,7 +178,6 @@ distribution:
.if ${MK_NTP} != "no"
${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt

View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
FILES= devfs.rules periodic.conf
FILES= devfs.rules
FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no"

View File

@ -1,5 +0,0 @@
# $FreeBSD$
BINDIR= /etc/periodic/${.CURDIR:T}
NO_OBJ=
FILESMODE= 755

View File

@ -1,6 +1,10 @@
# $FreeBSD$
FILES= periodic.conf
FILESDIR= /etc/defaults
SCRIPTS=periodic.sh
MAN= periodic.8
SUBDIR= etc
.include <bsd.prog.mk>

View File

@ -0,0 +1,6 @@
# $FreeBSD$
CONFMODE= 755
CONFDIR= ETC_PERIODIC_${.CURDIR:T:U}
ETC_PERIODIC_${.CURDIR:T:U}= /etc/periodic/${.CURDIR:T}
NO_OBJ=

View File

@ -2,9 +2,9 @@
.include <src.opts.mk>
FILESGROUPS=FILES
CONFGROUPS= CONFS
FILES= 100.clean-disks \
CONFS= 100.clean-disks \
110.clean-tmps \
120.clean-preserve \
140.clean-rwho \
@ -27,35 +27,34 @@ FILES= 100.clean-disks \
# NB: keep these sorted by MK_* knobs
.if ${MK_ACCT} != "no"
FILESGROUPS+= ACCT
CONFGROUPS+= ACCT
ACCT+= 310.accounting
.endif
ACCTDIR= /etc/periodic/daily
ACCTMODE= ${BINMODE}
ACCTPACKAGE= acct
.endif
.if ${MK_CALENDAR} != "no"
FILES+= 300.calendar
CONFS+= 300.calendar
.endif
.if ${MK_MAIL} != "no"
FILES+= 130.clean-msgs
CONFS+= 130.clean-msgs
.endif
.if ${MK_NTP} != "no"
FILES+= 480.status-ntpd \
CONFS+= 480.status-ntpd \
480.leapfile-ntpd
.endif
.if ${MK_SENDMAIL} != "no"
FILES+= 150.clean-hoststat \
CONFS+= 150.clean-hoststat \
440.status-mailq \
460.status-mail-rejects \
500.queuerun
.endif
.if ${MK_ZFS} != "no"
FILES+= 404.status-zfs \
CONFS+= 404.status-zfs \
800.scrub-zfs
.endif

View File

@ -2,19 +2,19 @@
.include <src.opts.mk>
FILESGROUPS=FILES
CONFGROUPS= CONFS
FILES= 450.status-security \
CONFS= 450.status-security \
999.local
# NB: keep these sorted by MK_* knobs
.if ${MK_UTMPX} != "no"
FILESGROUPS+= ACCT
CONFGROUPS+= ACCT
ACCT+= 200.accounting
.endif
ACCTDIR= /etc/periodic/monthly
ACCTMODE= ${BINMODE}
ACCTPACKAGE= acct
.endif
.include <bsd.prog.mk>

View File

@ -2,9 +2,9 @@
.include <src.opts.mk>
FILESGROUPS= FILES DATA
CONFGROUPS= CONFS DATA
FILES= 100.chksetuid \
CONFS= 100.chksetuid \
110.neggrpperm \
200.chkmounts \
300.chkuid0 \
@ -13,25 +13,26 @@ FILES= 100.chksetuid \
700.kernelmsg \
800.loginfail
DATA= security.functions
DATAMODE= 444
# NB: keep these sorted by MK_* knobs
.if ${MK_IPFILTER} != "no"
FILES+= 510.ipfdenied
FILES+= 610.ipf6denied
CONFS+= 510.ipfdenied
CONFS+= 610.ipf6denied
.endif
.if ${MK_IPFW} != "no"
FILES+= 500.ipfwdenied \
CONFS+= 500.ipfwdenied \
550.ipfwlimit
.endif
.if ${MK_PF} != "no"
FILES+= 520.pfdenied
CONFS+= 520.pfdenied
.endif
.if ${MK_INETD} != "no" && ${MK_TCP_WRAPPERS} != "no"
FILES+= 900.tcpwrap
CONFS+= 900.tcpwrap
.endif
.include <bsd.prog.mk>

View File

@ -2,18 +2,18 @@
.include <src.opts.mk>
FILES= 340.noid \
CONFS= 340.noid \
450.status-security \
999.local
# NB: keep these sorted by MK_* knobs
.if ${MK_LOCATE} != "no"
FILES+= 310.locate
CONFS+= 310.locate
.endif
.if ${MK_MAN_UTILS} != "no"
FILES+= 320.whatis
CONFS+= 320.whatis
.endif
.include <bsd.prog.mk>