--- doc/loncapafiles/ntpcheck.piml	2011/02/27 18:50:50	1.11
+++ doc/loncapafiles/ntpcheck.piml	2016/05/22 23:15:28	1.27
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.11 2011/02/27 18:50:50 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.27 2016/05/22 23:15:28 raeburn Exp $ -->
 
 <!--
 
@@ -38,45 +38,87 @@ 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;
-if (-e "/etc/init.d/ntpd") {
-   $NTPD = "ntpd";
-} elsif (-e "/etc/init.d/xntpd") {
-   $NTPD = "xntpd";
-} elsif (-e "/etc/init.d/ntp") {
-   $NTPD = "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 'rhes7')       || 
+    ('<DIST />' eq 'centos7')  || ('<DIST />' eq 'scientific7') ||
+    ('<DIST />' eq 'sles12')) {
+    $NTPD = 'ntpd';
+    $startntpcmd = 'systemctl start ntpd.service';
+    if (!-e '/usr/sbin/ntpd') {
+        print "ntp is not installed.\n";
+        exit;
+    }
 } else {
-    print "ntp is not installed.\n";
-    exit;
-}
-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 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
-    $checking_bin = '/usr/sbin/sysv-rc-conf';
+    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;
+    }
+    $startntpcnd = "/etc/init.d/$NTPD start";
+}
+
+if (open(PIPE,'-|',$checkcmd)) {
+    $is_running = &lt;PIPE&gt;;
+    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";
+    } else {
+        print "ntp is installed and running\n";
+    }
 } else {
-    $checking_bin = '/sbin/chkconfig';
+    print "Could not determine ntp status.\n";
 }
-$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";
+
+# 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 'rhes7')       ||
+    ('<DIST />' eq 'centos7')  || ('<DIST />' eq 'scientific7') ||
+    ('<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";
+        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>