--- doc/loncapafiles/chkconfig.piml	2011/11/25 17:36:49	1.21
+++ doc/loncapafiles/chkconfig.piml	2015/01/03 03:00:18	1.34
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.21 2011/11/25 17:36:49 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.34 2015/01/03 03:00:18 raeburn Exp $ -->
 
 <!--
 
@@ -45,16 +45,23 @@ my $use_systemctl;
 if ('<DIST />' eq 'suse9.3' || '<DIST />' eq 'suse9.2' || '<DIST />' eq 'sles9') {
     $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' || '<DIST />' eq 'suse12.1') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<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' || '<DIST />' eq 'suse13.2') {
     $webserver = 'apache2';
     @runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+} 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 'suse12.1')) {
+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 'suse13.2') || ('<DIST />' eq 'rhes7')       ||
+    ('<DIST />' eq 'centos7')  || ('<DIST />' eq 'scientific7') ||
+    ('<DIST />' eq 'sles12')) {
     $use_systemctl = 1;
 }
 exit if (! -x $checker_bin);
@@ -62,14 +69,14 @@ exit if (! -x $checker_bin);
 my $rlstr = join('',@runlevels);
 my $nrlstr = join('',@norunlevels);
 foreach my $service ($webserver,'loncontrol') {
-    if (($use_systemctl) && ($service eq 'httpd')) { 
-        my $command = "systemctl is-enabled httpd.service";
+    if (($use_systemctl) && ($service eq $webserver)) { 
+        my $command = "systemctl is-enabled ".$service.".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".$/;
+                  "    systemctl enable ".$service.".service".$/;
         }
     } else {
         my $command = $checker_bin.' --list '.$service;
@@ -77,7 +84,7 @@ foreach my $service ($webserver,'loncont
         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') {
+            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".$/;