--- doc/loncapafiles/chkconfig.piml	2013/04/04 15:06:39	1.26
+++ doc/loncapafiles/chkconfig.piml	2023/04/28 19:17:32	1.56
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.26 2013/04/04 15:06:39 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.56 2023/04/28 19:17:32 raeburn Exp $ -->
 
 <!--
 
@@ -37,6 +37,7 @@ http://www.lon-capa.org/
 <perlscript mode="fg">
 my $checker_bin = '/sbin/chkconfig';
 my $systemctl_bin = '/bin/systemctl';
+my $systemctl_only = 0;
 my $webserver ='httpd';
 my @runlevels = qw/3 4 5/;
 my @norunlevels = qw/0 1 6/;
@@ -45,33 +46,57 @@ 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' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3') {
+} 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' || '<DIST />' eq 'ubuntu12') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
     @runlevels = qw/2 3 4 5/;
     @norunlevels = qw/0 1 6/;
     $checker_bin = '/usr/sbin/sysv-rc-conf';
     $webserver = 'apache2';
+} elsif (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'ubuntu20') || ('<DIST />' eq 'sles15')) {
+    $webserver = 'apache2';
+    $use_systemctl = 1;
+    $systemctl_only = 1;
+} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
+         ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
+         ('<DIST />' eq 'fedora30') || ('<DIST />' eq 'fedora31') ||
+         ('<DIST />' eq 'fedora32') || ('<DIST />' eq 'fedora33') ||
+         ('<DIST />' eq 'fedora34') || ('<DIST />' eq 'fedora35') || 
+         ('<DIST />' eq 'centos8')  || ('<DIST />' eq 'rhes8')    || 
+         ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')  ||
+         ('<DIST />' eq 'rocky8')   || ('<DIST />' eq 'alma8')    ||
+         ('<DIST />' eq 'centos8-stream') || ('<DIST />' eq 'centos9-stream') ||
+         ('<DIST />' eq 'rhes9')    || ('<DIST />' eq 'oracle9')  ||
+         ('<DIST />' eq 'rocky9')   || ('<DIST />' eq 'alma9')    || {
+    $use_systemctl = 1;
+    $systemctl_only = 1;
 }
-if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') || 
-    ('<DIST />' eq 'fedora18') || ('<DIST />' eq 'suse12.1') ||
-    ('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3')) {
+if (('<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 '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);
+exit if (((!$systemctl_only) && (! -x $checker_bin)) && (! -x $systemctl_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) || ($systemctl_only)) {
+        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;
@@ -79,10 +104,10 @@ 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' || '<DIST />' eq 'ubuntu12') {
+            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') {
                 print "        $checker_bin --level $nrlstr $service off".$/;
             } else {
-                print "        $checker_bin --add $webserver".$/;
+                print "        $checker_bin --add $service".$/;
             }
             print "        $checker_bin --level $rlstr $service on".$/;
         } else {