Since r254974, periodic scripts' period can be configured

independently.  There is no reason to leave their options
with the daily ones, so move them to their own section.
Move periodic scripts' options into their own section.  Since r254974,

1 files changed, 70 insertions, 66 deletions

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 5dd7fa9..9fb6859 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -162,6 +162,71 @@ daily_scrub_zfs_default_threshold="35"		# days between scrubs
 daily_local="/etc/daily.local"				# Local scripts
 
 
+# Weekly options
+
+# These options are used by periodic(8) itself to determine what to do
+# with the output of the sub-programs that are run, and where to send
+# that output.  $weekly_output might be set to /var/log/weekly.log if you
+# wish to log the weekly output and have the files rotated by newsyslog(8)
+#
+weekly_output="root"					# user or /file
+weekly_show_success="YES"				# scripts returning 0
+weekly_show_info="YES"					# scripts returning 1
+weekly_show_badconfig="NO"				# scripts returning 2
+
+# 310.locate
+weekly_locate_enable="YES"				# Update locate weekly
+
+# 320.whatis
+weekly_whatis_enable="YES"				# Update whatis weekly
+
+# 330.catman
+weekly_catman_enable="NO"				# Preformat man pages
+
+# 340.noid
+weekly_noid_enable="NO"					# Find unowned files
+weekly_noid_dirs="/"					# Look here
+
+# 400.status-pkg
+weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
+pkg_version=pkg_version					# Use this program
+pkg_version_index=/usr/ports/INDEX-10			# Use this index file
+
+# 450.status-security
+weekly_status_security_enable="YES"			# Security check
+# See also "Security options" above for more options
+weekly_status_security_inline="NO"			# Run inline ?
+weekly_status_security_output="root"			# user or /file
+
+# 999.local
+weekly_local="/etc/weekly.local"			# Local scripts
+
+
+# Monthly options
+
+# These options are used by periodic(8) itself to determine what to do
+# with the output of the sub-programs that are run, and where to send
+# that output.  $monthly_output might be set to /var/log/monthly.log if you
+# wish to log the monthly output and have the files rotated by newsyslog(8)
+#
+monthly_output="root"					# user or /file
+monthly_show_success="YES"				# scripts returning 0
+monthly_show_info="YES"					# scripts returning 1
+monthly_show_badconfig="NO"				# scripts returning 2
+
+# 200.accounting
+monthly_accounting_enable="YES"				# Login accounting
+
+# 450.status-security
+monthly_status_security_enable="YES"			# Security check
+# See also "Security options" above for more options
+monthly_status_security_inline="NO"			# Run inline ?
+monthly_status_security_output="root"			# user or /file
+
+# 999.local
+monthly_local="/etc/monthly.local"			# Local scripts
+
+
 # Security options
 
 # These options are used by the security periodic(8) scripts spawned in
@@ -169,11 +234,14 @@ daily_local="/etc/daily.local"				# Local scripts
 security_status_logdir="/var/log"			# Directory for logs
 security_status_diff_flags="-b -u"			# flags for diff output
 
-# Each of the security_status_*_enable options below can have one of the
+# Each of the security_status_*_period options below can have one of the
 # following values:
-# - NO
+# - NO: do not run at all
 # - daily: only run during the daily security status
 # - weekly: only run during the weekly security status
+# - monthly: only run during the monthly security status
+# Note that if periodic security scripts are run from crontab(5) directly,
+# they will be run unless _enable or _period is set to "NO".
 
 # 100.chksetuid
 security_status_chksetuid_enable="YES"
@@ -239,70 +307,6 @@ security_status_tcpwrap_enable="YES"
 security_status_tcpwrap_period="daily"
 
 
-# Weekly options
-
-# These options are used by periodic(8) itself to determine what to do
-# with the output of the sub-programs that are run, and where to send
-# that output.  $weekly_output might be set to /var/log/weekly.log if you
-# wish to log the weekly output and have the files rotated by newsyslog(8)
-#
-weekly_output="root"					# user or /file
-weekly_show_success="YES"				# scripts returning 0
-weekly_show_info="YES"					# scripts returning 1
-weekly_show_badconfig="NO"				# scripts returning 2
-
-# 310.locate
-weekly_locate_enable="YES"				# Update locate weekly
-
-# 320.whatis
-weekly_whatis_enable="YES"				# Update whatis weekly
-
-# 330.catman
-weekly_catman_enable="NO"				# Preformat man pages
-
-# 340.noid
-weekly_noid_enable="NO"					# Find unowned files
-weekly_noid_dirs="/"					# Look here
-
-# 400.status-pkg
-weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
-pkg_version=pkg_version					# Use this program
-pkg_version_index=/usr/ports/INDEX-10			# Use this index file
-
-# 450.status-security
-weekly_status_security_enable="YES"			# Security check
-# See also "Security options" above for more options
-weekly_status_security_inline="NO"			# Run inline ?
-weekly_status_security_output="root"			# user or /file
-
-# 999.local
-weekly_local="/etc/weekly.local"			# Local scripts
-
-
-# Monthly options
-
-# These options are used by periodic(8) itself to determine what to do
-# with the output of the sub-programs that are run, and where to send
-# that output.  $monthly_output might be set to /var/log/monthly.log if you
-# wish to log the monthly output and have the files rotated by newsyslog(8)
-#
-monthly_output="root"					# user or /file
-monthly_show_success="YES"				# scripts returning 0
-monthly_show_info="YES"					# scripts returning 1
-monthly_show_badconfig="NO"				# scripts returning 2
-
-# 200.accounting
-monthly_accounting_enable="YES"				# Login accounting
-
-# 450.status-security
-monthly_status_security_enable="YES"			# Security check
-# See also "Security options" above for more options
-monthly_status_security_inline="NO"			# Run inline ?
-monthly_status_security_output="root"			# user or /file
-
-# 999.local
-monthly_local="/etc/monthly.local"			# Local scripts
-
 
 # Define source_periodic_confs, the mechanism used by /etc/periodic/*/*
 # scripts to source defaults/periodic.conf overrides safely.