Retire dsa-is-shutdown-scheduled in favor of test -e /run/systemd/shutdown/scheduled

diff --git a/modules/debian_org/files/dsa-is-shutdown-scheduled b/modules/debian_org/files/dsa-is-shutdown-scheduled
deleted file mode 100644 (file)
index 4dd1a7f..0000000
--- a/modules/debian_org/files/dsa-is-shutdown-scheduled
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# sysvinit
-if /usr/lib/nagios/plugins/check_procs -w 1: -u root -C shutdown > /dev/null; then
-       exit 0
-fi
-# jessie
-if pgrep -u root -fx /lib/systemd/systemd-shutdownd > /dev/null; then
-       exit 0
-fi
-# stretch
-if busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager ScheduledShutdown 2> /dev/null | awk '$3 > 0 { t=$3 } END { exit (t == 0)}'; then
-       exit 0
-fi
-exit 1

diff --git a/modules/debian_org/files/molly-guard/15-acquire-reboot-lock b/modules/debian_org/files/molly-guard/15-acquire-reboot-lock
index c97861b..0bc2fdd 100644 (file)
--- a/modules/debian_org/files/molly-guard/15-acquire-reboot-lock
+++ b/modules/debian_org/files/molly-guard/15-acquire-reboot-lock
@@ -12,7 +12,7 @@ fi
 echo "Reboot lock acquired."
 
 (
 echo "Reboot lock acquired."
 
 (

-       while dsa-is-shutdown-scheduled; do
+       while [ -e /run/systemd/shutdown/scheduled ]; do

                sleep 1
        done
 ) &
                sleep 1
        done
 ) &

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index cdf1e62..be1fe71 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -269,8 +269,7 @@ class debian_org {
                group  => root,
        }
        file { '/usr/local/bin/dsa-is-shutdown-scheduled':
                group  => root,
        }
        file { '/usr/local/bin/dsa-is-shutdown-scheduled':

-               source  => 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
-               mode    => '0555',
+               ensure => 'absent',

        }
 
        exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
        }
 
        exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':

diff --git a/modules/mirror_health/files/mirror-health b/modules/mirror_health/files/mirror-health
index 025382e..6484595 100755 (executable)
--- a/modules/mirror_health/files/mirror-health
+++ b/modules/mirror_health/files/mirror-health
@@ -40,7 +40,7 @@ def healthy(response):
     return False
 
 def check_shutdown():
     return False
 
 def check_shutdown():

-    if subprocess.call(['dsa-is-shutdown-scheduled']) == 0:
+    if os.path.exists('/run/systemd/shutdown/scheduled'):

         logging.info("considering myself unhealthy, shutdown scheduled")
         return False
     return True
         logging.info("considering myself unhealthy, shutdown scheduled")
         return False
     return True

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index d641b82..a7bc2d7 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -2,7 +2,7 @@
 # if a system is running shutdown.  We do not use check_nrpe's
 # exit code as that does not reliably tell us if the check could
 # not connect to the nrpe server or if the remote check returned not-null.
 # if a system is running shutdown.  We do not use check_nrpe's
 # exit code as that does not reliably tell us if the check could
 # not connect to the nrpe server or if the remote check returned not-null.

-command[dsa2_shutdown]=if /usr/local/bin/dsa-is-shutdown-scheduled; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi
+command[dsa2_shutdown]=if [ -e /run/systemd/shutdown/scheduled ]; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi

 command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart
 command[restart-samhain]=sudo /usr/sbin/service samhain restart
 command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart
 command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart
 command[restart-samhain]=sudo /usr/sbin/service samhain restart
 command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart