--- doc/loncapafiles/chkconfig.piml	2006/09/15 20:51:56	1.3
+++ doc/loncapafiles/chkconfig.piml	2011/10/25 13:01:32	1.18
@@ -1,9 +1,9 @@
 <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
-<!-- phpcheck.piml -->
+<!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.3 2006/09/15 20:51:56 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.18 2011/10/25 13:01:32 raeburn Exp $ -->
 
 <!--
 
@@ -33,70 +33,74 @@ http://www.lon-capa.org/
 <targetroot>/</targetroot>
 <files>
 <file>
-<target dist="default">/home/httpd/lonUsers</target>
+<target dist="default"></target>
 <perlscript mode="fg">
-my $chkconfig_bin = '/sbin/chkconfig';
-exit if (! -x $chkconfig_bin);
-
-my $webserver = 'httpd';
+my $checker_bin = '/sbin/chkconfig';
+my $systemctl_bin = '/bin/systemctl';
+my $webserver ='httpd';
 my @runlevels = qw/3 4 5/;
+my @norunlevels = qw/0 1 6/;
+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') {
+} 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') {
     $webserver = 'apache2';
+    @runlevels = qw/3 5/;
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+    @runlevels = qw/2 3 4 5/;
+    @norunlevels = qw/0 1 6/;
+    $checker_bin = '/usr/sbin/sysv-rc-conf';
+    $webserver = 'apache2';
+} elsif ('<DIST />' eq 'fedora16') {
+    $use_systemctl = 1;
 }
-my $command = $chkconfig_bin.' --list '.$webserver;
-my $results = `$command`;
-if ($results eq '') {
-    print "**** WARNING: $webserver is not set to run on boot.$/".
-        "    Execute the following commands to fix this:".$/.
-        "        $chkconfig_bin --add $webserver".$/.
-        "        $chkconfig_bin $webserver on".$/;
-} else {
-    my %httpd_runlevels;
-    for (my $rl = 0;$rl &lt;=6;$rl++) {
-        if ($results =~ /$rl:on/) { $httpd_runlevels{$rl}++; }
-    }
-    #
-    my $warning;
-    foreach my $rl (@runlevels) {
-        if (! exists($httpd_runlevels{$rl}) ) {
-            $warning .= 
-               "**** WARNING: $webserver is not set to run at runlevel $rl".$/;
-        }
-    }
-    if ($warning) {
-        print $warning.
-            "    Execute the following command to fix this:".$/.
-            "        /sbin/chkconfig $webserver on ".$/;
-    }
-}
+exit if (! -x $checker_bin);
 
-$command = $chkconfig_bin.' --list loncontrol';
-$results = `$command`;
-if ($results eq '') {
-    print "**** WARNING: loncontrol is not set to run on boot.$/".
-        "    Execute the following commands to fix this:".$/.
-        "        $chkconfig_bin --add loncontrol".$/.
-        "        $chkconfig_bin loncontrol on".$/;
-} else {
-    my %loncontrol_runlevels;
-    for (my $rl = 0;$rl&lt;=6;$rl++) {
-        if ($results =~ /$rl:on/) { $loncontrol_runlevels{$rl}++; }
-    }
-    #
-    $warning = '';
-    foreach my $rl (@runlevels) {
-        if (! exists($loncontrol_runlevels{$rl})) {
-            $warning .= 
-                "**** WARNING: loncontrol is not set to run at runlevel $rl\n";
+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";
+        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".$/;
+        }
+    } else {
+        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') {
+                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:".$/.
-            "        /sbin/chkconfig loncontrol on ".$/;
     }
 }