--- doc/loncapafiles/chkconfig.piml	2017/10/23 23:57:46	1.38
+++ doc/loncapafiles/chkconfig.piml	2020/01/01 01:34:01	1.48
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.38 2017/10/23 23:57:46 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.48 2020/01/01 01:34:01 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/;
@@ -53,25 +54,36 @@ if ('<DIST />' eq 'suse9.3' || '<DIST />
     @norunlevels = qw/0 1 6/;
     $checker_bin = '/usr/sbin/sysv-rc-conf';
     $webserver = 'apache2';
+} elsif (('<DIST />' eq 'ubuntu18') || ('<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 'centos8')  || ('<DIST />' eq 'rhes8')    ||
+         ('<DIST />' eq 'oracle7')  || ('<DIST />' eq 'oracle8')) {
+    $use_systemctl = 1;
+    $systemctl_only = 1;
 }
 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 'fedora26') || ('<DIST />' eq 'suse12.1')    ||
-    ('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3')    ||
-    ('<DIST />' eq 'suse13.1') || ('<DIST />' eq 'suse13.2')    ||
-    ('<DIST />' eq 'sles12')   || ('<DIST />' eq 'rhes7')       ||
-    ('<DIST />' eq 'centos7')  || ('<DIST />' eq 'scientific7')) {
+    ('<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 $webserver)) { 
+    if (($use_systemctl) && ($service eq $webserver) || ($systemctl_only)) {
         my $command = "systemctl is-enabled ".$service.".service";
         my $results = `$command`;
         chomp($results);
@@ -89,7 +101,7 @@ foreach my $service ($webserver,'loncont
             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 {