Another overhaul of the periodic stuff.

All periodic sub-scripts <larf> now have their return codes interpreted
by periodic(8).  Output may be masked based on variable values in
periodic.conf.

It's also now possible to email periodic output to arbitrary addresses,
or to send it to a log file, examples of which can be found in
newsyslog.conf.

The upshot of it all should be no discernable changes to the default
behaviour of periodic(8).

PR:	21250

2 files changed, 162 insertions, 46 deletions

diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 4d3d3ea..4ab3dec 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -33,17 +33,14 @@
 run periodic system functions
 .Sh SYNOPSIS
 .Nm periodic
-.Ao
-.Cm daily | weekly | monthly |
-.Ar path Op path ...
-.Ac
+.Ar directory Ns No ...
 .Sh DESCRIPTION
 The
 .Nm
 program is intended to be called by cron(8) to execute shell scripts
 located in the specified directory.
 .Pp
-One, and only one, of the following arguments should be specified:
+One or more of the following arguments must be specified:
 .Bl -tag -width Fl
 .It Cm daily
 Perform the standard daily periodic executable run.
@@ -55,14 +52,89 @@ This usually occurs on Sunday mornings.
 Perform the standard monthly periodic executable run.
 This usually occurs on the first day of the month.
 .It Ar path
-An absolute path to a directory containing a set of executables to be run.
+An arbitrary directory containing a set of executables to be run.
 .El
 .Pp
+If an argument is an absolute directory name it is used as is, otherwise
+it is searched for under
+.Pa /etc/periodic
+and any other directories specified by the
+.Va local_periodic
+setting in
+.Xr periodic.conf 5
+(see below).
+.Pp
 The
 .Nm
 program will run each executable file in the directory or directories
-specified.  If a file does not have the executable bit set,  it will be
-ignored silently.
+specified.
+If a file does not have the executable bit set,  it is silently ignored.
+.Pp
+Each script is required to exit with one of the following values:
+.Bl -tag -width XXXX
+.It 0
+The script has produced nothing notable in it's output.
+The
+.Va <basedir>_show_success
+variable controls the masking of this output.
+.It 1
+The script has produced some notable information in it's output.
+The
+.Va <basedir>_show_info
+variable controls the masking of this output.
+.It 2
+The script has produced some warnings due to invalid configuration settings.
+The
+.Va <basedir>_show_badconfig
+variable controls the masking of this output.
+.It >2
+The script has produced output that must not be masked.
+.El
+.Pp
+If the relevant variable (where
+.Ar <basedir>
+is the base directory in which the script resides) is set to
+.Dq NO
+in
+.Pa periodic.conf ,
+.Nm
+will mask the script output.
+If the variable is not set to either
+.Dq YES
+or
+.Dq NO ,
+it will be given a default value as described in
+.Xr periodic.conf 5 .
+.Pp
+All remaining script output is delivered based on the value of the
+.Va <basedir>_output
+setting.
+.Pp
+If this is set to a path name (beginning with a 
+.Dq /
+Character), output is simply logged to that file.
+.Xr newsyslog 8
+knows about the files
+.Pa /var/log/daily.log ,
+.Pa /var/log/weekly.log
+and
+.Pa /var/log/monthly.log ,
+and if they exist, it will rotate them at the appropriate times.
+These are therefore good values if you wish to log
+.Nm
+output.
+.Pp
+If the
+.Va <basedir>_output
+value does not begin with a
+.Dq / ,
+it is assumed to contain a list of email addresses, and the output is
+mailed to them.
+.Pp
+If
+.Va <basedir>_output
+is not set, it defaults to
+.Dq root .
 .Sh ENVIRONMENT
 The 
 .Nm
@@ -89,13 +161,16 @@ subdirectories which contain standard system periodic executables.
 .It Pa /etc/defaults/periodic.conf
 The
 .Pa periodic.conf
-system registry contains a variable
-.Va local_periodic
-which may be configured to specify additional top level standard
-periodic directories, such as
-.Pa /usr/local/etc/periodic
+system registry contains variables that control the behaviour of
+.Nm
+and the standard
+.Pa daily ,
+.Pa weekly ,
 and
-.Pa /usr/X11R6/etc/periodic .
+.Pa monthly
+scripts.
+.It Pa /etc/periodic.conf
+This file contains local overrides for the default periodic configuration.
 .El
 .Sh EXAMPLES
 The system crontab should have entries for
@@ -103,22 +178,40 @@ The system crontab should have entries for
 similar to the following example:
 .Pp
 .Dl # do daily/weekly/monthly maintenance
-.Dl 0      2       *       *       *       root    periodic daily   2>&1
-.Dl 0      3       *       *       6       root    periodic weekly  2>&1
-.Dl 0      5       1       *       *       root    periodic monthly 2>&1
+.Dl 0      2       *       *       *       root    periodic daily
+.Dl 0      3       *       *       6       root    periodic weekly
+.Dl 0      5       1       *       *       root    periodic monthly
 .Pp
-Additionally, the
+The
 .Pa /etc/defaults/periodic.conf
 system registry will typically have a
 .Va local_periodic
 variable reading:
 .Pp
 .Dl local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic"
+.Pp
+To log
+.Nm
+output instead of receiving it as email, add the following lines to
+.Pa /etc/periodic.conf :
+.Pp
+.Dl daily_output=/var/log/daily.log
+.Dl weekly_output=/var/log/weekly.log
+.Dl monthly_output=/var/log/monthly.log
+.Pp
+To only see important information from daily periodic jobs, add the
+following lines to
+.Pa /etc/periodic.conf :
+.Pp
+.Dl daily_show_success=NO
+.Dl daily_show_info=NO
+.Dl daily_show_badconfig=NO
 .Sh SEE ALSO
 .Xr sh 1 ,
 .Xr crontab 5 ,
 .Xr periodic.conf 5 ,
-.Xr cron 8
+.Xr cron 8 ,
+.Xr newsyslog 8
 .Rs
 .Sh DIAGNOSTICS
 Exit status is 0 on success and 1 if the command
@@ -138,3 +231,4 @@ program first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
 .An Paul Traina Aq pst@FreeBSD.org
+.An Brian Somers Aq brian@Awfulhak.org
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index 7141710..f3b5d22 100644
--- a/usr.sbin/periodic/periodic.sh
+++ b/usr.sbin/periodic/periodic.sh
@@ -25,43 +25,65 @@ if [ -r /etc/defaults/periodic.conf ]; then
     source_periodic_confs
 fi
 
-dir=$1
-run=`basename $dir`
+dirlist=
 
 # If a full path was not specified, check the standard cron areas
 
-if [ "$dir" = "$run" ] ; then
-    dirlist=""
-    for top in /etc/periodic ${local_periodic} ; do
-	if [ -d $top/$dir ] ; then
-	    dirlist="${dirlist} $top/$dir"
-	fi
-    done
-
-# User wants us to run stuff in a particular directory
-else
-   for dir in $* ; do
-       if [ ! -d $dir ] ; then
-	   echo "$0: $dir not found" 1>&2
-	   exit 1
-       fi
-   done
-
-   dirlist="$*"
-fi
+for dir
+do
+    case "$dir" in
+    /*)
+	if [ -d "$dir" ]
+	then
+	    dirlist="$dirlist $dir"
+	else
+	    echo "$0: $dir not found" >&2 
+	fi;;
+    *)
+	for top in /etc/periodic ${local_periodic}
+	do
+	    [ -d $top/$dir ] && dirlist="$dirlist $top/$dir"
+	done;;
+    esac
+done
 
 host=`hostname`
 export host
-echo "Subject: $host $run run output"
+tmp_output=/var/run/periodic.$$
 
 # Execute each executable file in the directory list.  If the x bit is not
 # set, assume the user didn't really want us to muck with it (it's a
 # README file or has been disabled).
 
-for dir in $dirlist ; do
-    for file in $dir/* ; do
-	if [ -x $file -a ! -d $file ] ; then
-	    $file
-	fi
+for dir in $dirlist
+do
+    eval output=\$${dir##*/}_output
+    case "$output" in
+    /*) pipe="cat >>$output";;
+    *)  pipe="mail -s '$host ${dir##*/} run output' ${output:-root}";;
+    esac
+
+    success=YES info=YES badconfig=NO	# Defaults when ${run}_* aren't YES/NO
+    for var in success info badconfig
+    do
+	case $(eval echo "\$${dir##*/}_show_$var") in
+	[Yy][Ee][Ss]) eval $var=YES;;
+	[Nn][Oo])     eval $var=NO;;
+	esac
     done
+
+    for file in $dir/*
+    do
+	if [ -x $file -a ! -d $file ]
+	then
+	    $file </dev/null >$tmp_output 2>&1
+	    case $? in
+	    0)  [ $success = YES ] && cat $tmp_output;;
+	    1)  [ $info = YES ] && cat $tmp_output;;
+	    2)  [ $badconfig = YES ] && cat $tmp_output;;
+	    *)  cat $tmp_output;;
+	    esac
+	    rm -f $tmp_output
+	fi
+    done | eval $pipe
 done