--- doc/loncapafiles/ntpcheck.piml	2014/05/03 15:31:17	1.21
+++ doc/loncapafiles/ntpcheck.piml	2017/06/30 03:23:27	1.30
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.21 2014/05/03 15:31:17 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.30 2017/06/30 03:23:27 raeburn Exp $ -->
 
 <!--
 
@@ -38,12 +38,17 @@ http://www.lon-capa.org/
 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;
-my $checkcmd = 'ps -ef |grep ntp |grep -v grep';
+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 'rhes7')    ||
+    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'centos7')  ||
+    ('<DIST />' eq 'sles12')) {
     $NTPD = 'ntpd';
     $startntpcmd = 'systemctl start ntpd.service';
     if (!-e '/usr/sbin/ntpd') {
@@ -61,7 +66,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)) {
@@ -70,27 +75,36 @@ if (open(PIPE,'-|',$checkcmd)) {
     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";
+    } else {
+        print "ntp is installed and running\n";
     }
 } else {
     print "Could not determine ntp 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' '<DIST />' eq 'ubuntu14') {
-    $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 (('<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 'rhes7')    ||
+    ('<DIST />' eq 'scientific7') || ('<DIST />' eq 'centos7')  ||
+    ('<DIST />' eq 'sles12')) {
     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";