--- doc/loncapafiles/ntpcheck.piml	2013/11/30 22:06:31	1.20
+++ doc/loncapafiles/ntpcheck.piml	2021/07/28 14:44:30	1.48
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.20 2013/11/30 22:06:31 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.48 2021/07/28 14:44:30 raeburn Exp $ -->
 
 <!--
 
@@ -36,18 +36,60 @@ 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";
+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 'sles15')   ||
+    ('<DIST />' eq 'centos8')  || ('<DIST />' eq 'rhes8')    ||
+    ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')  ||
+    ('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
+    print "For more information on chronyd please see https://chrony.tuxfamily.org/\n";
+} else {
+    print "For more information on ntpd please see http://www.ntp.org/\n";
+}
 my $NTPD;
-my $checkcmd = 'ps -ef |grep ntp |grep -v grep';
+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')) {
+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 'centos7')     || ('<DIST />' eq 'rhes7')    ||
+    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'sles12')      || ('<DIST />' eq 'sles15')   || 
+    ('<DIST />' eq 'ubuntu18')    || ('<DIST />' eq 'ubuntu20') || 
+    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  || 
+    ('<DIST />' eq 'oracle8')) {
     $NTPD = 'ntpd';
-    $startntpcmd = 'systemctl start ntpd.service';
-    if (!-e '/usr/sbin/ntpd') {
-        print "ntp is not installed.\n";
+    my $binname = $NTPD;
+    if (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20')) {
+        $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 'sles15')   ||
+             ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'centos8')  ||
+             ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')) {
+        $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 {
@@ -61,7 +103,7 @@ if (('<DIST />' eq 'fedora15') || ('<DIS
         print "ntp is not installed.\n";
         exit;
     }
-    $startntpcnd = "/etc/init.d/$NTPD start";
+    $startntpcmd = "/etc/init.d/$NTPD start";
 }
 
 if (open(PIPE,'-|',$checkcmd)) {
@@ -69,28 +111,49 @@ if (open(PIPE,'-|',$checkcmd)) {
     chomp($is_running);
     close(PIPE);
     if (!$is_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 $startntpcmd\n";
+        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 ntp status.\n";
+    print "Could not determine $name status.\n";
 }
 
 # chkconfig barfs to stderr if the target isn't set up right.
-my $checking_bin;
-my $restartchk;
-if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
-    $checking_bin = '/usr/sbin/sysv-rc-conf';
-} else {
-    $checking_bin = '/sbin/chkconfig';
-}
-if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || 
-    ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
-    ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')) {
-    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";
+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 'scientific7') || ('<DIST />' eq 'centos7')  || 
+    ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'sles12')      || ('<DIST />' eq 'sles15')   ||
+    ('<DIST />' eq 'ubuntu18')    || ('<DIST />' eq 'ubuntu20') ||
+    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  || 
+    ('<DIST />' eq 'oracle8')) {
+    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";