Allow a subset of checks to be run.

Now we can configure more and less frequent checks.

diff --git a/check b/check
index 74c7f80e65e70562421c2ea77b91e3860a96dcda..0cde4f3e1d6bbb308251210ae0557b4f29a0ffca 100755 (executable)
--- a/check
+++ b/check
@@ -4,9 +4,26 @@
 
 set -e
 
 
 set -e
 

+fix () {
+  n=$1
+  while :; do
+    case $n in
+      0) break ;;
+      0*) n=${n#0} ;;
+      *) break ;;
+    esac
+  done
+  echo $n
+}
+min=$(fix ${1-0}) max=$(fix ${2-99})
+

 exec 4>&1
 rc=0
 for check in check.d/[!#]*[!~]; do
 exec 4>&1
 rc=0
 for check in check.d/[!#]*[!~]; do

+  base=${check##*/}
+  seq=${base%%[!0-9]*}
+  if [ $min -gt $seq -o $seq -gt $max ]; then continue; fi
+

   nrc=$(
     exec 5>&1
     { { { set +e; "$check"; rc=$?; set -e
   nrc=$(
     exec 5>&1
     { { { set +e; "$check"; rc=$?; set -e

diff --git a/check.d/10.daemons b/check.d/10.daemons
new file mode 100755 (executable)
index 0000000..78dc3a3
--- /dev/null
+++ b/check.d/10.daemons
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+rc=0
+
+check () {
+  path=$1
+  if [ -x $path ] && ! pgrep -x ${path##*/} >/dev/null; then
+    echo >&2 $path not running
+    rc=1
+  fi
+}
+
+check /usr/sbin/ekeyd
+check /usr/sbin/ekeyd-egd-linux
+check /usr/sbin/yaid
+
+exit $rc

diff --git a/check.d/logs b/check.d/10.logs
similarity index 100%
rename from check.d/logs
rename to check.d/10.logs

diff --git a/check.d/ntp b/check.d/10.ntp
similarity index 100%
rename from check.d/ntp
rename to check.d/10.ntp

diff --git a/check.d/disks b/check.d/30.disks
similarity index 100%
rename from check.d/disks
rename to check.d/30.disks

diff --git a/check.d/updates b/check.d/50.updates
similarity index 100%
rename from check.d/updates
rename to check.d/50.updates

diff --git a/rcheck b/rcheck
index c4f59a87f3c827673ff8f11643b7af9b570ee355..9849a3981be67455c6029f5a10f59b35b455ae6c 100755 (executable)
--- a/rcheck
+++ b/rcheck
@@ -12,12 +12,29 @@ do
   prog=$(readlink "${prog##*/}")
 done
 
   prog=$(readlink "${prog##*/}")
 done
 

+args=""
+usage () {
+  echo "usage: ${0##*/} [-[MIN-][MAX]] [HOST...]"
+}
+while :; do
+  case $# in 0) break ;; esac
+  case $1 in
+    -) break ;;
+    --) shift; break ;;
+    -*[!0-9]*-* | -*-*[!0-9]*) usage >&2; exit 1 ;;
+    -*-) a=${1#-}; a=${a%-}; args="$a" ;;
+    -*-*) a=${1#-}; b=${a#*-}; a=${a%-*}; args="$a $b" ;;
+    -*[!0-9]*) usage >&2; exit 1 ;;
+    -*) a=${1#-}; args="0 $a" ;;
+    *) break ;;
+  esac
+  shift
+done

 case $# in 0) set -- $(expand-list /etc/slaves :rcheck_hosts) ;; esac
 
 exec 4>&1
 rc=0
 for host in "$@"; do
 case $# in 0) set -- $(expand-list /etc/slaves :rcheck_hosts) ;; esac
 
 exec 4>&1
 rc=0
 for host in "$@"; do

-

   nrc=$(
     exec 5>&1
     { { { set +e
   nrc=$(
     exec 5>&1
     { { { set +e


@@ -39,7 +56,7 @@ trap "cd /; rm -rf /tmp/$tmpdir" INT TERM QUIT HUP EXIT
 cd $tmpdir
 
 tar xzf -
 cd $tmpdir
 
 tar xzf -

-./check'
+./check'" $args"

          rc=$?; set -e; echo $rc >&5
          case $rc in
            0) ;;
          rc=$?; set -e; echo $rc >&5
          case $rc in
            0) ;;