--- doc/loncapafiles/ntpcheck.piml	2018/06/19 12:26:32	1.33
+++ doc/loncapafiles/ntpcheck.piml	2019/12/03 04:55:10	1.42
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.33 2018/06/19 12:26:32 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.42 2019/12/03 04:55:10 raeburn Exp $ -->
 
 <!--
 
@@ -36,8 +36,19 @@ 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 'sles15')   || ('<DIST />' eq 'centos8')  || 
+    ('<DIST />' eq 'rhes8')    || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'oracle8')  || ('<DIST />' eq 'ubuntu18')) {
+    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 $name = 'ntp';
+my $binname = $name;
 my $checkcmd = 'ps -ef |grep ntp |grep -v grep |grep -v ntpcheck';
 my $startntpcmd;
 my $is_running;
@@ -48,16 +59,32 @@ if (('<DIST />' eq 'fedora15')    || ('<
     ('<DIST />' eq 'fedora23')    || ('<DIST />' eq 'fedora24') ||
     ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
     ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
-    ('<DIST />' eq 'centos7')     || ('<DIST />' eq 'rhes7')    ||
+    ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'centos7')  ||
+    ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
     ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')   ||
-    ('<DIST />' eq 'ubuntu18')) {
+    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
+    ('<DIST />' eq 'rhes8')       || ('<DIST />' eq 'centos8')  ||
+    ('<DIST />' eq 'oracle8')) {
     $NTPD = 'ntpd';
     if ('<DIST />' eq 'ubuntu18') {
-        $NTPD = 'ntp'; 
+        $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 '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/$NTPD") {
-        print "ntp is not installed.\n";
+    if (!-e "/usr/sbin/$binname") {
+        print "$name is not installed.\n";
         exit;
     }
 } else {
@@ -79,12 +106,16 @@ 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 "ntp is installed and running\n";
+        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.
@@ -95,9 +126,13 @@ if (('<DIST />' eq 'fedora15')    || ('<
     ('<DIST />' eq 'fedora23')    || ('<DIST />' eq 'fedora24') ||
     ('<DIST />' eq 'fedora25')    || ('<DIST />' eq 'fedora26') ||
     ('<DIST />' eq 'fedora27')    || ('<DIST />' eq 'fedora28') ||
-    ('<DIST />' eq 'centos7')     || ('<DIST />' eq 'rhes7')    ||
-    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
-    ('<DIST />' eq 'ubuntu18')) {
+    ('<DIST />' eq 'fedora29')    || ('<DIST />' eq 'fedora30') ||
+    ('<DIST />' eq 'fedora31')    || ('<DIST />' eq 'centos7')  || 
+    ('<DIST />' eq 'rhes7')       || ('<DIST />' eq 'oracle7')  ||
+    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12')   ||
+    ('<DIST />' eq 'sles15')      || ('<DIST />' eq 'ubuntu18') ||
+    ('<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";
     }