From 13ea1f5be7616aa3699921e1e4f79542767b3142 Mon Sep 17 00:00:00 2001 From: brd Date: Sat, 11 Aug 2018 17:11:08 +0000 Subject: [PATCH] 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 --- etc/Makefile | 1 - etc/defaults/Makefile | 2 +- etc/periodic/Makefile.inc | 5 ----- usr.sbin/periodic/Makefile | 4 ++++ .../periodic/etc}/Makefile | 0 usr.sbin/periodic/etc/Makefile.inc | 6 ++++++ .../periodic/etc}/daily/100.clean-disks | 0 .../periodic/etc}/daily/110.clean-tmps | 0 .../periodic/etc}/daily/120.clean-preserve | 0 .../periodic/etc}/daily/130.clean-msgs | 0 .../periodic/etc}/daily/140.clean-rwho | 0 .../periodic/etc}/daily/150.clean-hoststat | 0 .../periodic/etc}/daily/200.backup-passwd | 0 .../periodic/etc}/daily/210.backup-aliases | 0 .../periodic/etc}/daily/300.calendar | 0 .../periodic/etc}/daily/310.accounting | 0 .../periodic/etc}/daily/330.news | 0 .../periodic/etc}/daily/400.status-disks | 0 .../periodic/etc}/daily/401.status-graid | 0 .../periodic/etc}/daily/404.status-zfs | 0 .../periodic/etc}/daily/406.status-gmirror | 0 .../periodic/etc}/daily/407.status-graid3 | 0 .../periodic/etc}/daily/408.status-gstripe | 0 .../periodic/etc}/daily/409.status-gconcat | 0 .../periodic/etc}/daily/410.status-mfi | 0 .../periodic/etc}/daily/420.status-network | 0 .../periodic/etc}/daily/430.status-uptime | 0 .../periodic/etc}/daily/440.status-mailq | 0 .../periodic/etc}/daily/450.status-security | 0 .../etc}/daily/460.status-mail-rejects | 0 .../periodic/etc}/daily/480.leapfile-ntpd | 0 .../periodic/etc}/daily/480.status-ntpd | 0 .../periodic/etc}/daily/500.queuerun | 0 .../etc}/daily/510.status-world-kernel | 0 .../periodic/etc}/daily/800.scrub-zfs | 0 .../periodic/etc}/daily/999.local | 0 .../periodic/etc}/daily/Makefile | 19 +++++++++---------- .../periodic/etc}/monthly/200.accounting | 0 .../periodic/etc}/monthly/450.status-security | 0 .../periodic/etc}/monthly/999.local | 0 .../periodic/etc}/monthly/Makefile | 8 ++++---- .../periodic/etc}/security/100.chksetuid | 0 .../periodic/etc}/security/110.neggrpperm | 0 .../periodic/etc}/security/200.chkmounts | 0 .../periodic/etc}/security/300.chkuid0 | 0 .../periodic/etc}/security/400.passwdless | 0 .../periodic/etc}/security/410.logincheck | 0 .../periodic/etc}/security/500.ipfwdenied | 0 .../periodic/etc}/security/510.ipfdenied | 0 .../periodic/etc}/security/520.pfdenied | 0 .../periodic/etc}/security/550.ipfwlimit | 0 .../periodic/etc}/security/610.ipf6denied | 0 .../periodic/etc}/security/700.kernelmsg | 0 .../periodic/etc}/security/800.loginfail | 0 .../periodic/etc}/security/900.tcpwrap | 0 .../periodic/etc}/security/Makefile | 15 ++++++++------- .../periodic/etc}/security/security.functions | 0 .../periodic/etc}/weekly/310.locate | 0 .../periodic/etc}/weekly/320.whatis | 0 .../periodic/etc}/weekly/340.noid | 0 .../periodic/etc}/weekly/450.status-security | 0 .../periodic/etc}/weekly/999.local | 0 .../periodic/etc}/weekly/Makefile | 6 +++--- .../periodic}/periodic.conf | 0 64 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 etc/periodic/Makefile.inc rename {etc/periodic => usr.sbin/periodic/etc}/Makefile (100%) create mode 100644 usr.sbin/periodic/etc/Makefile.inc rename {etc/periodic => usr.sbin/periodic/etc}/daily/100.clean-disks (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/110.clean-tmps (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/120.clean-preserve (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/130.clean-msgs (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/140.clean-rwho (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/150.clean-hoststat (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/200.backup-passwd (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/210.backup-aliases (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/300.calendar (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/310.accounting (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/330.news (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/400.status-disks (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/401.status-graid (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/404.status-zfs (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/406.status-gmirror (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/407.status-graid3 (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/408.status-gstripe (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/409.status-gconcat (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/410.status-mfi (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/420.status-network (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/430.status-uptime (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/440.status-mailq (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/450.status-security (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/460.status-mail-rejects (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/480.leapfile-ntpd (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/480.status-ntpd (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/500.queuerun (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/510.status-world-kernel (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/800.scrub-zfs (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/999.local (100%) rename {etc/periodic => usr.sbin/periodic/etc}/daily/Makefile (79%) rename {etc/periodic => usr.sbin/periodic/etc}/monthly/200.accounting (100%) rename {etc/periodic => usr.sbin/periodic/etc}/monthly/450.status-security (100%) rename {etc/periodic => usr.sbin/periodic/etc}/monthly/999.local (100%) rename {etc/periodic => usr.sbin/periodic/etc}/monthly/Makefile (78%) rename {etc/periodic => usr.sbin/periodic/etc}/security/100.chksetuid (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/110.neggrpperm (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/200.chkmounts (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/300.chkuid0 (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/400.passwdless (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/410.logincheck (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/500.ipfwdenied (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/510.ipfdenied (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/520.pfdenied (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/550.ipfwlimit (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/610.ipf6denied (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/700.kernelmsg (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/800.loginfail (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/900.tcpwrap (100%) rename {etc/periodic => usr.sbin/periodic/etc}/security/Makefile (70%) rename {etc/periodic => usr.sbin/periodic/etc}/security/security.functions (100%) rename {etc/periodic => usr.sbin/periodic/etc}/weekly/310.locate (100%) rename {etc/periodic => usr.sbin/periodic/etc}/weekly/320.whatis (100%) rename {etc/periodic => usr.sbin/periodic/etc}/weekly/340.noid (100%) rename {etc/periodic => usr.sbin/periodic/etc}/weekly/450.status-security (100%) rename {etc/periodic => usr.sbin/periodic/etc}/weekly/999.local (100%) rename {etc/periodic => usr.sbin/periodic/etc}/weekly/Makefile (78%) rename {etc/defaults => usr.sbin/periodic}/periodic.conf (100%) diff --git a/etc/Makefile b/etc/Makefile index 72d855698ee..f18ace66399 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index 7c25ac3af18..1ea65722370 100644 --- a/etc/defaults/Makefile +++ b/etc/defaults/Makefile @@ -2,7 +2,7 @@ .include -FILES= devfs.rules periodic.conf +FILES= devfs.rules FILESDIR= /etc/defaults .if ${MK_BLUETOOTH} != "no" diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc deleted file mode 100644 index a05341cd8f0..00000000000 --- a/etc/periodic/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -BINDIR= /etc/periodic/${.CURDIR:T} -NO_OBJ= -FILESMODE= 755 diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile index 875d078435e..a721f9db09b 100644 --- a/usr.sbin/periodic/Makefile +++ b/usr.sbin/periodic/Makefile @@ -1,6 +1,10 @@ # $FreeBSD$ +FILES= periodic.conf +FILESDIR= /etc/defaults SCRIPTS=periodic.sh MAN= periodic.8 +SUBDIR= etc + .include diff --git a/etc/periodic/Makefile b/usr.sbin/periodic/etc/Makefile similarity index 100% rename from etc/periodic/Makefile rename to usr.sbin/periodic/etc/Makefile diff --git a/usr.sbin/periodic/etc/Makefile.inc b/usr.sbin/periodic/etc/Makefile.inc new file mode 100644 index 00000000000..a1fed7ac7af --- /dev/null +++ b/usr.sbin/periodic/etc/Makefile.inc @@ -0,0 +1,6 @@ +# $FreeBSD$ + +CONFMODE= 755 +CONFDIR= ETC_PERIODIC_${.CURDIR:T:U} +ETC_PERIODIC_${.CURDIR:T:U}= /etc/periodic/${.CURDIR:T} +NO_OBJ= diff --git a/etc/periodic/daily/100.clean-disks b/usr.sbin/periodic/etc/daily/100.clean-disks similarity index 100% rename from etc/periodic/daily/100.clean-disks rename to usr.sbin/periodic/etc/daily/100.clean-disks diff --git a/etc/periodic/daily/110.clean-tmps b/usr.sbin/periodic/etc/daily/110.clean-tmps similarity index 100% rename from etc/periodic/daily/110.clean-tmps rename to usr.sbin/periodic/etc/daily/110.clean-tmps diff --git a/etc/periodic/daily/120.clean-preserve b/usr.sbin/periodic/etc/daily/120.clean-preserve similarity index 100% rename from etc/periodic/daily/120.clean-preserve rename to usr.sbin/periodic/etc/daily/120.clean-preserve diff --git a/etc/periodic/daily/130.clean-msgs b/usr.sbin/periodic/etc/daily/130.clean-msgs similarity index 100% rename from etc/periodic/daily/130.clean-msgs rename to usr.sbin/periodic/etc/daily/130.clean-msgs diff --git a/etc/periodic/daily/140.clean-rwho b/usr.sbin/periodic/etc/daily/140.clean-rwho similarity index 100% rename from etc/periodic/daily/140.clean-rwho rename to usr.sbin/periodic/etc/daily/140.clean-rwho diff --git a/etc/periodic/daily/150.clean-hoststat b/usr.sbin/periodic/etc/daily/150.clean-hoststat similarity index 100% rename from etc/periodic/daily/150.clean-hoststat rename to usr.sbin/periodic/etc/daily/150.clean-hoststat diff --git a/etc/periodic/daily/200.backup-passwd b/usr.sbin/periodic/etc/daily/200.backup-passwd similarity index 100% rename from etc/periodic/daily/200.backup-passwd rename to usr.sbin/periodic/etc/daily/200.backup-passwd diff --git a/etc/periodic/daily/210.backup-aliases b/usr.sbin/periodic/etc/daily/210.backup-aliases similarity index 100% rename from etc/periodic/daily/210.backup-aliases rename to usr.sbin/periodic/etc/daily/210.backup-aliases diff --git a/etc/periodic/daily/300.calendar b/usr.sbin/periodic/etc/daily/300.calendar similarity index 100% rename from etc/periodic/daily/300.calendar rename to usr.sbin/periodic/etc/daily/300.calendar diff --git a/etc/periodic/daily/310.accounting b/usr.sbin/periodic/etc/daily/310.accounting similarity index 100% rename from etc/periodic/daily/310.accounting rename to usr.sbin/periodic/etc/daily/310.accounting diff --git a/etc/periodic/daily/330.news b/usr.sbin/periodic/etc/daily/330.news similarity index 100% rename from etc/periodic/daily/330.news rename to usr.sbin/periodic/etc/daily/330.news diff --git a/etc/periodic/daily/400.status-disks b/usr.sbin/periodic/etc/daily/400.status-disks similarity index 100% rename from etc/periodic/daily/400.status-disks rename to usr.sbin/periodic/etc/daily/400.status-disks diff --git a/etc/periodic/daily/401.status-graid b/usr.sbin/periodic/etc/daily/401.status-graid similarity index 100% rename from etc/periodic/daily/401.status-graid rename to usr.sbin/periodic/etc/daily/401.status-graid diff --git a/etc/periodic/daily/404.status-zfs b/usr.sbin/periodic/etc/daily/404.status-zfs similarity index 100% rename from etc/periodic/daily/404.status-zfs rename to usr.sbin/periodic/etc/daily/404.status-zfs diff --git a/etc/periodic/daily/406.status-gmirror b/usr.sbin/periodic/etc/daily/406.status-gmirror similarity index 100% rename from etc/periodic/daily/406.status-gmirror rename to usr.sbin/periodic/etc/daily/406.status-gmirror diff --git a/etc/periodic/daily/407.status-graid3 b/usr.sbin/periodic/etc/daily/407.status-graid3 similarity index 100% rename from etc/periodic/daily/407.status-graid3 rename to usr.sbin/periodic/etc/daily/407.status-graid3 diff --git a/etc/periodic/daily/408.status-gstripe b/usr.sbin/periodic/etc/daily/408.status-gstripe similarity index 100% rename from etc/periodic/daily/408.status-gstripe rename to usr.sbin/periodic/etc/daily/408.status-gstripe diff --git a/etc/periodic/daily/409.status-gconcat b/usr.sbin/periodic/etc/daily/409.status-gconcat similarity index 100% rename from etc/periodic/daily/409.status-gconcat rename to usr.sbin/periodic/etc/daily/409.status-gconcat diff --git a/etc/periodic/daily/410.status-mfi b/usr.sbin/periodic/etc/daily/410.status-mfi similarity index 100% rename from etc/periodic/daily/410.status-mfi rename to usr.sbin/periodic/etc/daily/410.status-mfi diff --git a/etc/periodic/daily/420.status-network b/usr.sbin/periodic/etc/daily/420.status-network similarity index 100% rename from etc/periodic/daily/420.status-network rename to usr.sbin/periodic/etc/daily/420.status-network diff --git a/etc/periodic/daily/430.status-uptime b/usr.sbin/periodic/etc/daily/430.status-uptime similarity index 100% rename from etc/periodic/daily/430.status-uptime rename to usr.sbin/periodic/etc/daily/430.status-uptime diff --git a/etc/periodic/daily/440.status-mailq b/usr.sbin/periodic/etc/daily/440.status-mailq similarity index 100% rename from etc/periodic/daily/440.status-mailq rename to usr.sbin/periodic/etc/daily/440.status-mailq diff --git a/etc/periodic/daily/450.status-security b/usr.sbin/periodic/etc/daily/450.status-security similarity index 100% rename from etc/periodic/daily/450.status-security rename to usr.sbin/periodic/etc/daily/450.status-security diff --git a/etc/periodic/daily/460.status-mail-rejects b/usr.sbin/periodic/etc/daily/460.status-mail-rejects similarity index 100% rename from etc/periodic/daily/460.status-mail-rejects rename to usr.sbin/periodic/etc/daily/460.status-mail-rejects diff --git a/etc/periodic/daily/480.leapfile-ntpd b/usr.sbin/periodic/etc/daily/480.leapfile-ntpd similarity index 100% rename from etc/periodic/daily/480.leapfile-ntpd rename to usr.sbin/periodic/etc/daily/480.leapfile-ntpd diff --git a/etc/periodic/daily/480.status-ntpd b/usr.sbin/periodic/etc/daily/480.status-ntpd similarity index 100% rename from etc/periodic/daily/480.status-ntpd rename to usr.sbin/periodic/etc/daily/480.status-ntpd diff --git a/etc/periodic/daily/500.queuerun b/usr.sbin/periodic/etc/daily/500.queuerun similarity index 100% rename from etc/periodic/daily/500.queuerun rename to usr.sbin/periodic/etc/daily/500.queuerun diff --git a/etc/periodic/daily/510.status-world-kernel b/usr.sbin/periodic/etc/daily/510.status-world-kernel similarity index 100% rename from etc/periodic/daily/510.status-world-kernel rename to usr.sbin/periodic/etc/daily/510.status-world-kernel diff --git a/etc/periodic/daily/800.scrub-zfs b/usr.sbin/periodic/etc/daily/800.scrub-zfs similarity index 100% rename from etc/periodic/daily/800.scrub-zfs rename to usr.sbin/periodic/etc/daily/800.scrub-zfs diff --git a/etc/periodic/daily/999.local b/usr.sbin/periodic/etc/daily/999.local similarity index 100% rename from etc/periodic/daily/999.local rename to usr.sbin/periodic/etc/daily/999.local diff --git a/etc/periodic/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile similarity index 79% rename from etc/periodic/daily/Makefile rename to usr.sbin/periodic/etc/daily/Makefile index d06e59df8c8..b65bc1310cb 100644 --- a/etc/periodic/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -2,9 +2,9 @@ .include -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 diff --git a/etc/periodic/monthly/200.accounting b/usr.sbin/periodic/etc/monthly/200.accounting similarity index 100% rename from etc/periodic/monthly/200.accounting rename to usr.sbin/periodic/etc/monthly/200.accounting diff --git a/etc/periodic/monthly/450.status-security b/usr.sbin/periodic/etc/monthly/450.status-security similarity index 100% rename from etc/periodic/monthly/450.status-security rename to usr.sbin/periodic/etc/monthly/450.status-security diff --git a/etc/periodic/monthly/999.local b/usr.sbin/periodic/etc/monthly/999.local similarity index 100% rename from etc/periodic/monthly/999.local rename to usr.sbin/periodic/etc/monthly/999.local diff --git a/etc/periodic/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile similarity index 78% rename from etc/periodic/monthly/Makefile rename to usr.sbin/periodic/etc/monthly/Makefile index 64642193c57..ddcc9d9372c 100644 --- a/etc/periodic/monthly/Makefile +++ b/usr.sbin/periodic/etc/monthly/Makefile @@ -2,19 +2,19 @@ .include -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 diff --git a/etc/periodic/security/100.chksetuid b/usr.sbin/periodic/etc/security/100.chksetuid similarity index 100% rename from etc/periodic/security/100.chksetuid rename to usr.sbin/periodic/etc/security/100.chksetuid diff --git a/etc/periodic/security/110.neggrpperm b/usr.sbin/periodic/etc/security/110.neggrpperm similarity index 100% rename from etc/periodic/security/110.neggrpperm rename to usr.sbin/periodic/etc/security/110.neggrpperm diff --git a/etc/periodic/security/200.chkmounts b/usr.sbin/periodic/etc/security/200.chkmounts similarity index 100% rename from etc/periodic/security/200.chkmounts rename to usr.sbin/periodic/etc/security/200.chkmounts diff --git a/etc/periodic/security/300.chkuid0 b/usr.sbin/periodic/etc/security/300.chkuid0 similarity index 100% rename from etc/periodic/security/300.chkuid0 rename to usr.sbin/periodic/etc/security/300.chkuid0 diff --git a/etc/periodic/security/400.passwdless b/usr.sbin/periodic/etc/security/400.passwdless similarity index 100% rename from etc/periodic/security/400.passwdless rename to usr.sbin/periodic/etc/security/400.passwdless diff --git a/etc/periodic/security/410.logincheck b/usr.sbin/periodic/etc/security/410.logincheck similarity index 100% rename from etc/periodic/security/410.logincheck rename to usr.sbin/periodic/etc/security/410.logincheck diff --git a/etc/periodic/security/500.ipfwdenied b/usr.sbin/periodic/etc/security/500.ipfwdenied similarity index 100% rename from etc/periodic/security/500.ipfwdenied rename to usr.sbin/periodic/etc/security/500.ipfwdenied diff --git a/etc/periodic/security/510.ipfdenied b/usr.sbin/periodic/etc/security/510.ipfdenied similarity index 100% rename from etc/periodic/security/510.ipfdenied rename to usr.sbin/periodic/etc/security/510.ipfdenied diff --git a/etc/periodic/security/520.pfdenied b/usr.sbin/periodic/etc/security/520.pfdenied similarity index 100% rename from etc/periodic/security/520.pfdenied rename to usr.sbin/periodic/etc/security/520.pfdenied diff --git a/etc/periodic/security/550.ipfwlimit b/usr.sbin/periodic/etc/security/550.ipfwlimit similarity index 100% rename from etc/periodic/security/550.ipfwlimit rename to usr.sbin/periodic/etc/security/550.ipfwlimit diff --git a/etc/periodic/security/610.ipf6denied b/usr.sbin/periodic/etc/security/610.ipf6denied similarity index 100% rename from etc/periodic/security/610.ipf6denied rename to usr.sbin/periodic/etc/security/610.ipf6denied diff --git a/etc/periodic/security/700.kernelmsg b/usr.sbin/periodic/etc/security/700.kernelmsg similarity index 100% rename from etc/periodic/security/700.kernelmsg rename to usr.sbin/periodic/etc/security/700.kernelmsg diff --git a/etc/periodic/security/800.loginfail b/usr.sbin/periodic/etc/security/800.loginfail similarity index 100% rename from etc/periodic/security/800.loginfail rename to usr.sbin/periodic/etc/security/800.loginfail diff --git a/etc/periodic/security/900.tcpwrap b/usr.sbin/periodic/etc/security/900.tcpwrap similarity index 100% rename from etc/periodic/security/900.tcpwrap rename to usr.sbin/periodic/etc/security/900.tcpwrap diff --git a/etc/periodic/security/Makefile b/usr.sbin/periodic/etc/security/Makefile similarity index 70% rename from etc/periodic/security/Makefile rename to usr.sbin/periodic/etc/security/Makefile index 353ba6262a3..ce9e5f7ba5c 100644 --- a/etc/periodic/security/Makefile +++ b/usr.sbin/periodic/etc/security/Makefile @@ -2,9 +2,9 @@ .include -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 diff --git a/etc/periodic/security/security.functions b/usr.sbin/periodic/etc/security/security.functions similarity index 100% rename from etc/periodic/security/security.functions rename to usr.sbin/periodic/etc/security/security.functions diff --git a/etc/periodic/weekly/310.locate b/usr.sbin/periodic/etc/weekly/310.locate similarity index 100% rename from etc/periodic/weekly/310.locate rename to usr.sbin/periodic/etc/weekly/310.locate diff --git a/etc/periodic/weekly/320.whatis b/usr.sbin/periodic/etc/weekly/320.whatis similarity index 100% rename from etc/periodic/weekly/320.whatis rename to usr.sbin/periodic/etc/weekly/320.whatis diff --git a/etc/periodic/weekly/340.noid b/usr.sbin/periodic/etc/weekly/340.noid similarity index 100% rename from etc/periodic/weekly/340.noid rename to usr.sbin/periodic/etc/weekly/340.noid diff --git a/etc/periodic/weekly/450.status-security b/usr.sbin/periodic/etc/weekly/450.status-security similarity index 100% rename from etc/periodic/weekly/450.status-security rename to usr.sbin/periodic/etc/weekly/450.status-security diff --git a/etc/periodic/weekly/999.local b/usr.sbin/periodic/etc/weekly/999.local similarity index 100% rename from etc/periodic/weekly/999.local rename to usr.sbin/periodic/etc/weekly/999.local diff --git a/etc/periodic/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile similarity index 78% rename from etc/periodic/weekly/Makefile rename to usr.sbin/periodic/etc/weekly/Makefile index c32420a2be6..9c54eaa6483 100644 --- a/etc/periodic/weekly/Makefile +++ b/usr.sbin/periodic/etc/weekly/Makefile @@ -2,18 +2,18 @@ .include -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 diff --git a/etc/defaults/periodic.conf b/usr.sbin/periodic/periodic.conf similarity index 100% rename from etc/defaults/periodic.conf rename to usr.sbin/periodic/periodic.conf -- 2.45.0