--- doc/loncapafiles/chkconfig.piml	2011/02/27 18:54:59	1.13
+++ doc/loncapafiles/chkconfig.piml	2014/12/31 21:03:54	1.32
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.13 2011/02/27 18:54:59 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.32 2014/12/31 21:03:54 raeburn Exp $ -->
 
 <!--
 
@@ -36,49 +36,77 @@ http://www.lon-capa.org/
 <target dist="default"></target>
 <perlscript mode="fg">
 my $checker_bin = '/sbin/chkconfig';
+my $systemctl_bin = '/bin/systemctl';
 my $webserver ='httpd';
 my @runlevels = qw/3 4 5/;
-my $rlstr = join('',@runlevels);
+my @norunlevels = qw/0 1 6/;
+my $use_systemctl;
 
 if ('<DIST />' eq 'suse9.3' || '<DIST />' eq 'suse9.2' || '<DIST />' eq 'sles9') {
-    $checker_bin = '/';
     $webserver = 'apache';
     @runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1') {
     $webserver = 'apache2';
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+    @runlevels = qw/3 5/;
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+    @runlevels = qw/2 3 4 5/;
+    @norunlevels = qw/0 1 6/;
     $checker_bin = '/usr/sbin/sysv-rc-conf';
     $webserver = 'apache2';
 }
+if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') || 
+    ('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
+    ('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21') ||
+    ('<DIST />' eq 'suse12.1') || ('<DIST />' eq 'suse12.2') ||
+    ('<DIST />' eq 'suse12.3') || ('<DIST />' eq 'suse13.1') ||
+    ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7')     ||
+    ('<DIST />' eq 'scientific7')) {
+    $use_systemctl = 1;
+}
 exit if (! -x $checker_bin);
 
+my $rlstr = join('',@runlevels);
+my $nrlstr = join('',@norunlevels);
 foreach my $service ($webserver,'loncontrol') {
-    my $command = $checker_bin.' --list '.$service;
-    my $results = `$command`;
-    if ($results eq '') {
-        print "**** WARNING: $service is not set to run on boot.$/".
-        "    Execute the following commands to fix this:".$/;
-        unless ('<DIST />' eq 'debian5' ||  '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8') {
-             print "        $checker_bin --add $webserver".$/;
+    if (($use_systemctl) && ($service eq 'httpd')) { 
+        my $command = "systemctl is-enabled httpd.service";
+        my $results = `$command`;
+        chomp($results);
+        if ($results ne 'enabled') {
+            print "**** WARNING: $service is not set to run on boot.".$/.
+                  "    Execute the following commands to fix this:".$/.
+                  "    systemctl enable httpd.service".$/;
         }
-        print "        $checker_bin --level $rlstr $service on".$/;
     } else {
-        my %curr_runlevels;
-        for (my $rl = 0;$rl &lt;=6;$rl++) {
-           if ($results =~ /$rl:on/) { $curr_runlevels{$rl}++; }
-        }
-        #
-        my $warning;
-        foreach my $rl (@runlevels) {
-            if (! exists($curr_runlevels{$rl}) ) {
-                $warning .=
-                   "**** WARNING: $service is not set to run at runlevel $rl".$/;
+        my $command = $checker_bin.' --list '.$service;
+        my $results = `$command`;
+        if ($results eq '') {
+            print "**** WARNING: $service is not set to run on boot.$/".
+            "    Execute the following commands to fix this:".$/;
+            if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+                print "        $checker_bin --level $nrlstr $service off".$/;
+            } else {
+                print "        $checker_bin --add $webserver".$/;
+            }
+            print "        $checker_bin --level $rlstr $service on".$/;
+        } else {
+            my %curr_runlevels;
+            for (my $rl = 0;$rl &lt;=6;$rl++) {
+                if ($results =~ /$rl:on/) { $curr_runlevels{$rl}++; }
+            }
+            #
+            my $warning;
+            foreach my $rl (@runlevels) {
+                if (! exists($curr_runlevels{$rl}) ) {
+                    $warning .=
+                       "**** WARNING: $service is not set to run at runlevel $rl".$/;
+                }
+            }
+            if ($warning) {
+                print $warning.
+                      "    Execute the following command to fix this:".$/.
+                      "        $checker_bin --level $rlstr $service on".$/;
             }
-        }
-        if ($warning) {
-            print $warning.
-                  "    Execute the following command to fix this:".$/.
-                  "        $checker_bin --level $rlstr $service on".$/;
         }
     }
 }