--- doc/loncapafiles/ntpcheck.piml	2009/07/14 13:13:26	1.10
+++ doc/loncapafiles/ntpcheck.piml	2023/05/09 00:55:29	1.54
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.10 2009/07/14 13:13:26 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.54 2023/05/09 00:55:29 raeburn Exp $ -->
 
 <!--
 
@@ -36,47 +36,168 @@ http://www.lon-capa.org/
 <target dist="default"></target>
 <perlscript mode="fg">
 print "Checking to be sure the Network Time Protocol is running properly.\n";
-print "For more information on ntpd please see http://www.ntp.org/\n";
-my $NTPD;
-if (-e "/etc/init.d/ntpd") {
-   $NTPD = "ntpd";
-} elsif (-e "/etc/init.d/xntpd") {
-   $NTPD = "xntpd";
-} elsif (-e "/etc/init.d/ntp") {
-   $NTPD = "ntp"; 
+if (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
+    ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
+    ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
+    ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+    ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') ||  
+    ('<DIST />' eq 'fedora36') || ('<DIST />' eq 'fedora37') || 
+    ('<DIST />' eq 'fedora38') || ('<DIST />' eq 'sles15')   || 
+    ('<DIST />' eq 'centos8')  || ('<DIST />' eq 'rhes8')    ||
+    ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')  ||
+    ('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') ||
+    ('<DIST />' eq 'ubuntu22') || ('<DIST />' eq 'rocky8')   ||
+    ('<DIST />' eq 'alma8')    || ('<DIST />' eq 'centos8-stream') ||
+    ('<DIST />' eq 'centos9-stream') || ('<DIST />' eq 'rhes9') ||
+    ('<DIST />' eq 'oracle9')  || ('<DIST />' eq 'rocky9')   ||
+    ('<DIST />' eq 'alma9')) {
+    print "For more information on chronyd please see https://chrony.tuxfamily.org/\n";
 } else {
-    print "ntp is not installed.\n";
-    exit;
+    print "For more information on ntpd please see http://www.ntp.org/\n";
 }
-my $value = `/etc/init.d/$NTPD status`;
-if ($value !~ /running/) {
-    print "WARNING: ntp is installed but is not currently running.\nPlease verify the configuration of ntp in /etc/ntp.conf and /etc/ntp/step-tickers\nStart ntp by executing\n /etc/init.d/$NTPD start\n";
-}
-# chkconfig barfs to stderr if the target isn't set up right.
-my $checking_bin;
-my $restartchk;
-if ('<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
-    $checking_bin = '/usr/sbin/sysv-rc-conf';
+my $NTPD;
+my $name = 'ntp';
+my $checkcmd = 'ps -ef |grep ntp |grep -v grep |grep -v ntpcheck';
+my $startntpcmd;
+my $is_running;
+if (('<DIST />' eq 'fedora15')    || ('<DIST />' eq 'fedora16') ||
+    ('<DIST />' eq 'fedora17')    || ('<DIST />' eq 'fedora18') ||
+    ('<DIST />' eq 'fedora19')    || ('<DIST />' eq 'fedora20') ||
+    ('<DIST />' eq 'fedora21')    || ('<DIST />' eq 'fedora22') ||
+    ('<DIST />' eq 'fedora23')    || ('<DIST />' eq 'fedora24') ||
+    ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
+    ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
+    ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'fedora34') ||
+    ('<DIST />' eq 'fedora35')    || ('<DIST />' eq 'fedora36') ||
+    ('<DIST />' eq 'fedora37')    || ('<DIST />' eq 'fedora38') ||
+    ('<DIST />' eq 'centos7')     || ('<DIST />' eq 'rhes7')    ||
+    ('<DIST />' eq 'oracle7')     || ('<DIST />' eq 'scientific7') ||
+    ('<DIST />' eq 'sles12')      || ('<DIST />' eq 'sles15')   ||
+    ('<DIST />' eq 'ubuntu18')    || ('<DIST />' eq 'ubuntu20') || 
+    ('<DIST />' eq 'ubuntu22')    || ('<DIST />' eq 'rhes8')    ||
+    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')  ||
+    ('<DIST />' eq 'rocky8')      || ('<DIST />' eq 'alma8')    || 
+    ('<DIST />' eq 'centos8-stream') || ('<DIST />' eq 'centos9-stream') ||
+    ('<DIST />' eq 'rhes9')       || ('<DIST />' eq 'oracle9')  || 
+    ('<DIST />' eq 'rocky9')      || ('<DIST />' eq 'alma9')) {
+    $NTPD = 'ntpd';
+    my $binname = $NTPD;
+    if (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') || 
+        ('<DIST />' eq 'ubuntu22')) { 
+        $NTPD = 'chrony';
+        $name = $NTPD;
+        $binname = 'chronyd';
+    } elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
+             ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
+             ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
+             ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+             ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') ||
+             ('<DIST />' eq 'fedora36') || ('<DIST />' eq 'fedora37') ||
+             ('<DIST />' eq 'fedora38') || ('<DIST />' eq 'sles15')   ||
+             ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'centos8')  ||
+             ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')  ||
+             ('<DIST />' eq 'rocky8')   || ('<DIST />' eq 'alma8')    || 
+             ('<DIST />' eq 'centos8-stream') || ('<DIST />' eq 'centos9-stream') ||
+             ('<DIST />' eq 'rhes9')    || ('<DIST />' eq 'oracle9')  ||
+             ('<DIST />' eq 'rocky9')   || ('<DIST />' eq 'alma9')) {
+        $NTPD = 'chronyd';
+        $name = $NTPD;
+        $binname = $NTPD;
+    }
+    $checkcmd = "systemctl is-enabled $NTPD.service";
+    $startntpcmd = "systemctl start $NTPD.service";
+    if (!-e "/usr/sbin/$binname") {
+        print "$name is not installed.\n";
+        exit;
+    }
 } else {
-    $checking_bin = '/sbin/chkconfig';
-}
-$restartchk = `$checking_bin --list $NTPD 2>/dev/null`;
-if ($restartchk eq '') {
-    print "**** WARNING: ntpd is either not installed or not configured to run at boot.\n";
-    exit;
-}
-if ($restartchk =~ /^error reading information on service / ||
-    $restartchk !~ /\d:(on|off)/) {
-    print "**** WARNING: Unable to check status $NTPD with $checking_bin.\n";
-    exit;
-}
-if ($restartchk !~ /\s3:on/) {
-    print "**** WARNING: ntpd is not set to start at runlevel 3.  To correct this run:\n$checking_bin --level 345 $NTPD on\n";
-    exit;
+    if (-e "/etc/init.d/ntpd") {
+        $NTPD = "ntpd";
+    } elsif (-e "/etc/init.d/xntpd") {
+        $NTPD = "xntpd";
+    } elsif (-e "/etc/init.d/ntp") {
+        $NTPD = "ntp"; 
+    } else {
+        print "ntp is not installed.\n";
+        exit;
+    }
+    $startntpcmd = "/etc/init.d/$NTPD start";
+}
+
+if (open(PIPE,'-|',$checkcmd)) {
+    $is_running = &lt;PIPE&gt;;
+    chomp($is_running);
+    close(PIPE);
+    if (!$is_running) {
+        print "WARNING: $name is installed but is not currently running.\n";
+        if ($name eq 'ntp') {
+            print "Please verify the configuration of ntp in /etc/ntp.conf and /etc/ntp/step-tickers\n";
+        }
+        print "Start $name by executing\n $startntpcmd\n";
+    } else {
+        print "$name is installed and running\n";
+    }
+} else {
+    print "Could not determine $name status.\n";
 }
-if ($restartchk !~ /\s5:on/) {
-    print "**** WARNING: ntpd is not set to start at runlevel 5.  To correct this run:\n$checking_bin --level 345 $NTPD on\n";
+
+# chkconfig barfs to stderr if the target isn't set up right.
+if (('<DIST />' eq 'fedora15')    || ('<DIST />' eq 'fedora16') ||
+    ('<DIST />' eq 'fedora17')    || ('<DIST />' eq 'fedora18') ||
+    ('<DIST />' eq 'fedora19')    || ('<DIST />' eq 'fedora20') ||
+    ('<DIST />' eq 'fedora21')    || ('<DIST />' eq 'fedora22') ||
+    ('<DIST />' eq 'fedora23')    || ('<DIST />' eq 'fedora24') ||
+    ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
+    ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
+    ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'fedora32') ||
+    ('<DIST />' eq 'fedora33')    || ('<DIST />' eq 'fedora34') ||
+    ('<DIST />' eq 'fedora35')    || ('<DIST />' eq 'fedora36') ||
+    ('<DIST />' eq 'fedora37')    || ('<DIST />' eq 'fedora38') ||
+    ('<DIST />' eq 'centos7')     || ('<DIST />' eq 'scientific7') ||
+    ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'sles12')      || ('<DIST />' eq 'sles15')   ||
+    ('<DIST />' eq 'ubuntu18')    || ('<DIST />' eq 'ubuntu20') ||
+    ('<DIST />' eq 'ubuntu22')    || ('<DIST />' eq 'rhes8')    ||
+    ('<DIST />' eq 'centos8')     || ('<DIST />' eq 'oracle8')  || 
+    ('<DIST />' eq 'rocky8')      || ('<DIST />' eq 'alma8')    ||
+    ('<DIST />' eq 'centos8-stream') || ('<DIST />' eq 'centos9-stream') ||
+    ('<DIST />' eq 'rhes9')       || ('<DIST />' eq 'oracle9')  ||
+    ('<DIST />' eq 'rocky9')      || ('<DIST />' eq 'alma9')) {
+    if (!-l "/etc/systemd/system/multi-user.target.wants/$NTPD.service") {  
+        print "**** WARNING: $NTPD is not configured to run at boot.  To correct this run:\nsystemctl enable $NTPD.service\n";
+    }
     exit;
+} else {
+    my $checking_bin;
+    my $restartchk;
+    if (('<DIST />' eq 'debian5') || ('<DIST />' eq 'debian6') || ('<DIST />' eq 'ubuntu6') || 
+        ('<DIST />' eq 'ubuntu8') || ('<DIST />' eq 'ubuntu10') || ('<DIST />' eq 'ubuntu12') || 
+        ('<DIST />' eq 'ubuntu14') || ('<DIST />' eq 'ubuntu16')) {
+        $checking_bin = '/usr/sbin/sysv-rc-conf';
+    } else {
+        $checking_bin = '/sbin/chkconfig';
+    }
+    $restartchk = `$checking_bin --list $NTPD 2>/dev/null`;
+    if ($restartchk eq '') {
+        print "**** WARNING: ntpd is either not installed or not configured to run at boot.\n";
+        exit;
+    }
+    if ($restartchk =~ /^error reading information on service / ||
+        $restartchk !~ /\d:(on|off)/) {
+        print "**** WARNING: Unable to check status $NTPD with $checking_bin.\n";
+        exit;
+    }
+    if ($restartchk !~ /\s3:on/) {
+        print "**** WARNING: ntpd is not set to start at runlevel 3.  To correct this run:\n$checking_bin --level 345 $NTPD on\n";
+        exit;
+    }
+    if ($restartchk !~ /\s5:on/) {
+        print "**** WARNING: ntpd is not set to start at runlevel 5.  To correct this run:\n$checking_bin --level 345 $NTPD on\n";
+        exit;
+    }
 }
 </perlscript>
 </file>