--- doc/install/linux/install.pl	2019/07/06 18:53:23	1.56
+++ doc/install/linux/install.pl	2019/12/03 04:55:08	1.61
@@ -77,7 +77,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.56 2019/07/06 18:53:23 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.61 2019/12/03 04:55:08 raeburn Exp $'."\n";
 }
 
 #
@@ -480,11 +480,11 @@ sub check_locale {
                     $command = 'sudo locale-gen en_US.UTF-8'."\n".
                                'sudo update-locale LANG=en_US.UTF-8';
                 } elsif ($distro =~ /^(suse|sles)/) {
-                    $command = 'yast language'; 
+                    $command = 'yast language';
                 } elsif (-e '/usr/bin/system-config-language') {
                     $command = 'system-config-language';
                 } elsif (-e '/usr/bin/localectl') {
-                    $command = 'localectl set-locale en_US.UTF-8';
+                    $command = '/usr/bin/localectl set-locale LANG=en_US.UTF-8';
                 } else {
                     $command = 'No standard command found';
                 }
@@ -734,6 +734,9 @@ sub chkconfig {
         if (($distro =~ /^ubuntu/) && ($version <= 8)) {
             $daemon{'cups'} = 'cupsys';
         }
+        if (($distro =~ /^ubuntu/) && ($version >= 18)) {
+            $daemon{'ntp'}    = 'chrony';
+        }
     } elsif ($distro =~ /^fedora(\d+)/) {
         my $version = $1;
         if ($version >= 15) {
@@ -748,6 +751,9 @@ sub chkconfig {
         if ($version >= 19) {
             $daemon{'mysql'} = 'mariadb';
         }
+        if ($version >= 26) {
+            $daemon{'ntp'} = 'chronyd';
+        }
     } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         my $version = $1;
         if ($version >= 7) {
@@ -1006,14 +1012,14 @@ sub chkapache {
     } elsif ($distro =~ /^(suse|sles)([\d\.]+)$/) {
         my ($name,$version) = ($1,$2);
         my $apache = 'apache';
-        my $conf_file = "$instdir/sles-suse/default-server.conf"; 
+        my $conf_file = "$instdir/sles-suse/default-server.conf";
         if ($version >= 10) {
             $apache = 'apache2';
         }
         if (($name eq 'sles') && ($version >= 12)) {
             $conf_file = "$instdir/sles-suse/apache2.4/default-server.conf";
         }
-        if (!-e "$conf_file") {
+        if (!-e $conf_file) {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
         } elsif (-e "/etc/$apache/default-server.conf") {
@@ -1042,6 +1048,7 @@ sub chkapache {
         }
     } else {
         my $configfile = 'httpd.conf';
+        my $mpmfile = 'mpm.conf';
         if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
             if ($1 >= 7) {
                 $configfile = 'apache2.4/httpd.conf';
@@ -1050,7 +1057,7 @@ sub chkapache {
             }
         } elsif ($distro =~ /^fedora(\d+)$/) {
             if ($1 > 17) {
-                $configfile = 'apache2.4/httpd.conf'; 
+                $configfile = 'apache2.4/httpd.conf';
             } elsif ($1 > 10) {
                 $configfile = 'new/httpd.conf';
             }
@@ -1068,6 +1075,20 @@ sub chkapache {
                 }
             }
         }
+        if (-e "/etc/httpd/conf.modules.d/00-mpm.conf") {
+            if (!-e "$instdir/centos-rhes-fedora-sl/$mpmfile") {
+                print &mt('Warning: No LON-CAPA Apache MPM configuration file found for installation check.')."\n";
+            } elsif ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") && (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) {
+                if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/$mpmfile /etc/httpd/conf.modules.d/00-mpm.conf |")) {
+                    my $diffres = <PIPE>;
+                    close(PIPE);
+                    chomp($diffres);
+                    if ($diffres) {
+                        $fixapache = 1;
+                    }
+                }
+            }
+        }
     }
     return $fixapache;
 }
@@ -1986,6 +2007,7 @@ if ($callsub{'apache'}) {
         &copy_apache2_debconf($instdir,$distro,$hostname);
     } else {
         &copy_httpd_conf($instdir,$distro,$hostname);
+        &copy_mpm_conf($instdir,$distro);
     }
 } else {
     print_and_log(&mt('Skipping configuration of Apache web server.')."\n");
@@ -2106,7 +2128,7 @@ if ($callsub{'firewall'}) {
                 }
             }
         }
-    } elsif ($distro =~ /^scientific/) {
+    } elsif ($distro =~ /^(scientific|oracle)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
                   'system-config-firewall-tui -- Customize',
                   'ssh, http')."\n";
@@ -2577,6 +2599,50 @@ sub copy_httpd_conf {
     print_and_log("\n");
 }
 
+###########################################################
+##
+## RHEL/CentOS/Fedora/Scientific Linux
+## Copy LON-CAPA mpm.conf to /etc/httpd/conf.modules.d/00-mpm.conf
+##
+## The LON-CAPA mpm.conf enables the prefork MPM module in
+## Apache. This is also the default for RHEL/CentOS/Oracle
+## Linux 7 and earlier, and Fedora 26 and earlier. For more
+## recent versions of those distros, the event MPM is enabled
+## by default. After &copy_mpm_conf() is run, the prefork MPM
+## module will be enabled instead of the event MPM module.
+##
+###########################################################
+
+sub copy_mpm_conf {
+    my ($instdir,$distro) = @_;
+    my $mpmfile = 'mpm.conf';
+    if ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") &&
+        (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) {
+        print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'mpm.conf'",
+                      "'/etc/httpd/conf.modules.d/00-mpm.conf'")."\n");
+        copy "$instdir/centos-rhes-fedora-sl/$mpmfile","/etc/httpd/conf.modules.d/00-mpm.conf";
+        chmod(0644,"/etc/httpd/conf.modules.d/00-mpm.conf");
+        print_and_log("\n");
+    } else {
+        my $logfail;
+        if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
+            if ($1 > 7) {
+                $logfail = 1;
+            }
+        } elsif ($distro =~ /^fedora(\d+)$/) {
+            if ($1 > 26) {
+                $logfail = 1;
+            }
+        }
+        if ($logfail) {
+            print_and_log(&mt('Warning: copying the LON-CAPA [_1] failed because [_2] and/or [_3] are missing.',
+                              $mpmfile,"'$instdir/centos-rhes-fedora-sl/$mpmfile'",
+                              "'/etc/httpd/conf.modules.d/00-mpm.conf'"));
+            print_and_log("\n");
+        }
+    }
+}
+
 ###############################################
 ##
 ## Copy loncapassl.conf and sslrewrite.conf
@@ -3182,7 +3248,7 @@ sub copy_sysconfig_apache2_file {
     if (($name eq 'sles') && ($version >= 12)) {
        $sysconf_file = "$instdir/sles-suse/apache2.4/sysconfig_apache2";
     }
-    copy "$sysconf_file","/etc/sysconfig/apache2";
+    copy $sysconf_file,"/etc/sysconfig/apache2";
     chmod(0444,"/etc/sysconfig/apache2");
 }