--- doc/install/linux/install.pl	2011/03/28 13:27:56	1.6
+++ doc/install/linux/install.pl	2024/06/20 00:29:49	1.90
@@ -26,7 +26,13 @@
 use strict;
 use File::Copy;
 use Term::ReadKey;
+use Socket;
+use Sys::Hostname::FQDN();
 use DBI;
+use File::Spec;
+use Cwd();
+use File::Basename();
+use lib File::Basename::dirname(Cwd::abs_path($0));
 use LCLocalization::localize;
 
 # ========================================================= The language handle
@@ -72,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.6 2011/03/28 13:27:56 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.90 2024/06/20 00:29:49 raeburn Exp $'."\n";
 }
 
 #
@@ -159,9 +165,20 @@ sub get_user_selection {
 }
 
 sub get_distro {
-    my ($distro,$gotprereqs,$updatecmd,$packagecmd,$installnow);
+    my ($distro,$gotprereqs,$updatecmd,$packagecmd,$installnow,$unknown);
     $packagecmd = '/bin/rpm -q LONCAPA-prerequisites ';
-    if (-e '/etc/redhat-release') {
+    if (-e '/etc/oracle-release') {
+        open(IN,'</etc/oracle-release');
+        my $versionstring=<IN>;
+        chomp($versionstring);
+        close(IN);
+        if ($versionstring =~ /^Oracle Linux Server release (\d+)/) {
+            my $version = $1;
+            $distro = 'oracle'.$1;
+            $updatecmd = 'yum install LONCAPA-prerequisites';
+            $installnow = 'yum -y install LONCAPA-prerequisites';
+        }
+    } elsif (-e '/etc/redhat-release') {
         open(IN,'</etc/redhat-release');
         my $versionstring=<IN>;
         chomp($versionstring);
@@ -191,19 +208,39 @@ sub get_distro {
             $distro = 'rhes'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /CentOS release (\d+)/) {
-            $distro = 'centos'.$1;
+        } elsif ($versionstring =~ /Red Hat Enterprise Linux release (\d+)/) {
+            $distro = 'rhes'.$1;
+            $updatecmd = 'dnf install LONCAPA-prerequisites';
+            $installnow = 'dnf -y install LONCAPA-prerequisites';
+        } elsif ($versionstring =~ /CentOS(| Linux| Stream) release (\d+)/) {
+            $distro = 'centos'.$2;
+            if ($1 eq ' Stream') {
+                $distro .= '-stream';
+            }
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /Scientific Linux SL release ([\d.]+) /) {
+        } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
             my $ver = $1;
             $ver =~ s/\.\d+$//;
             $distro = 'scientific'.$ver;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
+        } elsif ($versionstring =~ /Rocky Linux release ([\d.]+)/) {
+            my $ver = $1;
+            $ver =~ s/\.\d+$//;
+            $distro = 'rocky'.$ver;
+            $updatecmd = 'dnf install LONCAPA-prerequisites';
+            $installnow = 'dnf -y install LONCAPA-prerequisites';
+        } elsif ($versionstring =~ /AlmaLinux release ([\d.]+) /) {
+            my $ver = $1;
+            $ver =~ s/\.\d+$//;
+            $distro = 'alma'.$ver;
+            $updatecmd = 'dnf install LONCAPA-prerequisites';
+            $installnow = 'dnf -y install LONCAPA-prerequisites';
         } else {
             print &mt('Unable to interpret [_1] to determine system type.',
                       '/etc/redhat-release')."\n";
+            $unknown = 1;
         }
     } elsif (-e '/etc/SuSE-release') {
         open(IN,'</etc/SuSE-release');
@@ -219,7 +256,7 @@ sub get_distro {
             }
         } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
             $distro = 'suse'.$1;
-            $updatecmd = 'yast -i LONCAPA-preprequisites';
+            $updatecmd = 'yast -i LONCAPA-prerequisites';
         } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
             $distro = 'suse'.$1;
             if ($1 >= 10.3 ) {
@@ -230,19 +267,19 @@ sub get_distro {
         } else {
             print &mt('Unable to interpret [_1] to determine system type.',
                       '/etc/SuSE-release')."\n";
+            $unknown = 1;
         }
     } elsif (-e '/etc/issue') {
         open(IN,'</etc/issue');
         my $versionstring=<IN>;
         chomp($versionstring);
         close(IN);
-        $packagecmd = '/usr/bin/dpkg -l loncapa-prerequisites ';
-        $updatecmd = 'apt-get install loncapa-prerequisites';
         if ($versionstring =~ /^Ubuntu (\d+)\.\d+/i) {
             $distro = 'ubuntu'.$1;
             $updatecmd = 'sudo apt-get install loncapa-prerequisites';
         } elsif ($versionstring =~ /^Debian\s+GNU\/Linux\s+(\d+)\.\d+/i) {
             $distro = 'debian'.$1;
+            $updatecmd = 'apt-get install loncapa-prerequisites';
         } elsif (-e '/etc/debian_version') {
             open(IN,'</etc/debian_version');
             my $version=<IN>;
@@ -250,13 +287,15 @@ sub get_distro {
             close(IN);
             if ($version =~ /^(\d+)\.\d+\.?\d*/) {
                 $distro='debian'.$1;
+                $updatecmd = 'apt-get install loncapa-prerequisites';
             } else {
                 print &mt('Unable to interpret [_1] to determine system type.',
                           '/etc/debian_version')."\n";
+                $unknown = 1;
             }
-        } else {
-            print &mt('Unable to interpret [_1] to determine system type.',
-                      '/etc/issue')."\n";
+        }
+        if ($distro ne '') {
+            $packagecmd = '/usr/bin/dpkg -l loncapa-prerequisites ';
         }
     } elsif (-e '/etc/debian_version') {
         open(IN,'</etc/debian_version');
@@ -270,13 +309,104 @@ sub get_distro {
         } else {
             print &mt('Unable to interpret [_1] to determine system type.',
                       '/etc/debian_version')."\n";
+            $unknown = 1;
+        }
+    }
+    if (($distro eq '') && (!$unknown)) {
+        if (-e '/etc/os-release') {
+            if (open(IN,'<','/etc/os-release')) {
+                my ($id,$version);
+                while(<IN>) {
+                    chomp();
+                    if (/^ID="(\w+)"/) {
+                        $id=$1;
+                    } elsif (/^VERSION_ID="([\d\.]+)"/) {
+                        $version=$1;
+                    }
+                }
+                close(IN);
+                if ($id eq 'sles') {
+                    my ($major,$minor) = split(/\./,$version);
+                    if ($major =~ /^\d+$/) {
+                        $distro = $id.$major;
+                        $updatecmd = 'zypper install LONCAPA-prerequisites';
+                    }
+                }
+            }
+            if ($distro eq '') {
+                print &mt('Unable to interpret [_1] to determine system type.',
+                          '/etc/os-release')."\n";
+                $unknown = 1;
+            }
+        } else {
+            print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora, scientific linux, or oracle linux system.')."\n";
         }
-    } else {
-        print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora or scientific linux system.')."\n";
     }
     return ($distro,$packagecmd,$updatecmd,$installnow);
 }
 
+#
+# get_hostname() prompts the user to provide the server's hostname.
+#
+# If invalid input is provided, the routine is called recursively 
+# until, a valid hostname is provided.
+# 
+
+sub get_hostname {
+    my $hostname;
+    print &mt('Enter the hostname of this server, e.g., loncapa.somewhere.edu'."\n");
+    my $choice = <STDIN>;
+    chomp($choice);
+    $choice =~ s/(^\s+|\s+$)//g;
+    if ($choice eq '') {
+        print &mt("Hostname you entered was either blank or contanied only white space.\n");
+    } elsif ($choice =~ /^[\w\.\-]+$/) {
+        $hostname = $choice;
+    } else {
+        print &mt("Hostname you entered was invalid --  a hostname may only contain letters, numbers, - and .\n");
+    }
+    while ($hostname eq '') {
+        $hostname = &get_hostname();
+    }
+    print "\n";
+    return $hostname;
+}
+
+#
+# get_hostip() prompts the user to provide the server's IPv4 IP address
+#
+# If invalid input is provided, the routine is called recursively 
+# until, a valid IPv4 address is provided.
+#
+
+sub get_hostip {
+    my $hostip;
+    print &mt('Enter the IP address of this server, e.g., 192.168.10.24'."\n");
+    my $choice = <STDIN>;
+    chomp($choice);
+    $choice =~ s/(^\s+|\s+$)//g;
+    my $badformat = 1;
+    if ($choice eq '') {
+        print &mt("IP address you entered was either blank or contained only white space.\n"); 
+    } else {
+        if ($choice =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/) {
+            if (($1<=255) && ($2<=255) && ($3<=255) && ($4<=255)) {
+                $badformat = 0; 
+            }
+        }
+        if ($badformat) { 
+             print &mt('Host IP you entered was invalid -- a host IP has the format d.d.d.d where each d is an integer between 0 and 255')."\n";
+        } else {
+            $hostip = $choice;
+        }
+    }
+    while ($hostip eq '') {
+        $hostip = &get_hostip();
+    }
+    print "\n";
+    return $hostip;
+}
+
 sub check_prerequisites {
     my ($packagecmd,$distro) = @_;
     my $gotprereqs;
@@ -293,7 +423,7 @@ sub check_prerequisites {
             } else {
                 my $line = <PIPE>;
                 chomp($line);
-                if ($line =~ /^LONCAPA-prerequisites\-([\d\-]+)\.(\w+)$/) {
+                if ($line =~ /^LONCAPA\-prerequisites\-([\d\-]+)\.(?:[.\w]+)$/) {
                     $gotprereqs = $1;
                 }
             }
@@ -307,30 +437,81 @@ sub check_prerequisites {
 
 sub check_locale {
     my ($distro) = @_;
-    my ($fh,$command);
+    my ($fh,$langvar,$command,$earlyout);
+    $langvar = 'LANG';
     if ($distro =~ /^(ubuntu|debian)/) {
         if (!open($fh,"</etc/default/locale")) {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/default/locale');
+            $earlyout = 1;
+        }
+    } elsif ($distro =~ /^(suse|sles)(\d+)/) {
+        if (($1 eq 'sles') && ($2 >= 15)) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+                $earlyout = 1;
+            }
+        } else {
+            if (!open($fh,"</etc/sysconfig/language")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/sysconfig/language');
+                $earlyout = 1;
+            }
+            $langvar = 'RC_LANG';
+        }
+    } elsif ($distro =~ /^fedora(\d+)/) {
+        if ($1 >= 18) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+                $earlyout = 1;
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/i18n');
+            $earlyout = 1;
+        }
+    } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle|rocky|alma)(\d+)/) {
+        if ($1 >= 7) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+                $earlyout = 1;
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/i18n');
+            $earlyout = 1;
         }
     } else {
         if (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/sysconfig/i18n');
+            $earlyout = 1;
         }
     }
+    return if ($earlyout);
     my @data = <$fh>;
     chomp(@data);
     foreach my $item (@data) {
-        if ($item =~ /^LANG=\"([^\"]*)\"/) {
+        if ($item =~ /^\Q$langvar\E=\"?([^\"]*)\"?/) {
             my $default = $1;
             if ($default ne 'en_US.UTF-8') {
                 if ($distro =~ /^debian/) {
-                    $command = 'dpkg-reconfigure locales';
+                    $command = 'locale-gen en_US.UTF-8'."\n".
+                               'update-locale LANG=en_US.UTF-8';
                 } elsif ($distro =~ /^ubuntu/) {
-                    $command = 'sudo set-language-env -E'; 
-                } else {
+                    $command = 'sudo locale-gen en_US.UTF-8'."\n".
+                               'sudo update-locale LANG=en_US.UTF-8';
+                } elsif ($distro =~ /^(suse|sles)/) {
+                    $command = 'yast language';
+                } elsif (-e '/usr/bin/system-config-language') {
                     $command = 'system-config-language';
+                } elsif (-e '/usr/bin/localectl') {
+                    $command = '/usr/bin/localectl set-locale LANG=en_US.UTF-8';
+                } else {
+                    $command = 'No standard command found';
                 }
             }
             last;
@@ -348,14 +529,15 @@ sub check_required {
     }
     my $gotprereqs = &check_prerequisites($packagecmd,$distro); 
     if ($gotprereqs eq '') {
-        return ($distro,$gotprereqs);
+        return ($distro,$gotprereqs,'',$packagecmd,$updatecmd);
     }
     my $localecmd = &check_locale($distro);
     unless ($localecmd eq '') {
         return ($distro,$gotprereqs,$localecmd);
     }
-    my ($mysqlon,$mysqlsetup,$dbh,$has_pass,$has_lcdb,%recommended,$downloadstatus,
-        $filetouse,$production,$testing,$apachefw,$tostop);
+    my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,
+        %recommended,$downloadstatus,$filetouse,$production,$testing,$apachefw,
+        $tostop,$uses_systemctl,$mysql_has_wwwuser,$hostname,$hostip);
     my $wwwuid = &uid_of_www();
     my $wwwgid = getgrnam('www');
     if (($wwwuid eq '') || ($wwwgid eq '')) {
@@ -364,38 +546,71 @@ sub check_required {
     unless( -e "/usr/local/sbin/pwauth") {
         $recommended{'pwauth'} = 1;
     }
+    $hostname = Sys::Hostname::FQDN::fqdn();
+    if ($hostname eq '') {
+        $hostname =&get_hostname();
+    } else {
+        print &mt("Hostname detected: $hostname. Is that correct? ~[Y/n~]");
+        if (!&get_user_selection(1)) {
+            $hostname =&get_hostname();
+        }
+    }
+    $hostip = Socket::inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost');
+    if ($hostip eq '') {
+        $hostip=&get_hostip();
+    } else {
+        print &mt("Host IP address detected: $hostip. Is that correct? ~[Y/n~]");
+        if (!&get_user_selection(1)) {
+            $hostip=&get_hostip();
+        }
+    }
+    print_and_log("\n".&mt('Hostname is [_1] and IP address is [_2]',$hostname,$hostip)."\n");
     $mysqlon = &check_mysql_running($distro);
     if ($mysqlon) {
-        my $mysql_has_wwwuser = &check_mysql_wwwuser();
-        ($mysqlsetup,$has_pass,$dbh) = 
-            &check_mysql_setup($instdir,$dsn);
-        if ($mysqlsetup eq 'noroot') {
-            $recommended{'mysqlperms'} = 1;
+        ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) =
+            &check_mysql_setup($instdir,$dsn,$distro);
+        if ($mysqlsetup eq 'needsrestart') {
+            $mysqlrestart = '';
+            if ($distro eq 'ubuntu') {
+                $mysqlrestart = 'sudo ';
+            }
+            $mysqlrestart .= 'service mysql restart';
+            return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart);
         } else {
-            unless ($mysql_has_wwwuser) {
+            if ($mysqlsetup eq 'noroot') {
                 $recommended{'mysqlperms'} = 1;
+            } else {
+                unless ($mysql_has_wwwuser) {
+                    $recommended{'mysqlperms'} = 1;
+                }
+            }
+            if ($dbh) {
+                $has_lcdb = &check_loncapa_mysqldb($dbh);
+            }
+            unless ($has_lcdb) {
+                $recommended{'mysql'} = 1;
             }
-        }
-        if ($dbh) {
-            $has_lcdb = &check_loncapa_mysqldb($dbh);
-        }
-        unless ($has_lcdb) {
-            $recommended{'mysql'} = 1;
         }
     }
+    my ($sslhostsfilesref,$has_std,$has_int,$rewritenum,$nochgstd,$nochgint);
     ($recommended{'firewall'},$apachefw) = &chkfirewall($distro);
-    ($recommended{'runlevels'},$tostop) = &chkconfig($distro);
+    ($recommended{'runlevels'},$tostop,$uses_systemctl) = &chkconfig($distro,$instdir);
     $recommended{'apache'} = &chkapache($distro,$instdir);
+    ($recommended{'apachessl'},$sslhostsfilesref,$has_std,$has_int,$rewritenum,
+     $nochgstd,$nochgint) = &chkapachessl($distro,$instdir,$hostname,$hostip);
     $recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
     ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing) 
-        = &need_download();
+        = &need_download($distro,$instdir);
     return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-            \%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
-            $filetouse,$production,$testing,$apachefw);
+            $mysqlrestart,\%recommended,$dbh,$has_pass,$mysql_unix_socket,
+            $has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
+            $uses_systemctl,$hostname,$hostip,$sslhostsfilesref,$has_std,$has_int,
+            $rewritenum,$nochgstd,$nochgint);
 }
 
 sub check_mysql_running {
     my ($distro) = @_;
+    my $use_systemctl;
     my $mysqldaemon ='mysqld';
     if ($distro =~ /^(suse|sles|debian|ubuntu)/) {
         $mysqldaemon = 'mysql';
@@ -407,8 +622,51 @@ sub check_mysql_running {
             $process = 'mysqld';
             $proc_owner = 'mysql';
         }
+    } elsif ($distro =~ /^debian(\w+)/) {
+        if ($1 >= 10) {
+            $process = 'mysql';
+            $proc_owner = 'mysql';
+        }           
+        if ($1 >= 11) {
+            $mysqldaemon = 'mariadb';
+        }
+    } elsif ($distro =~ /^fedora(\d+)/) {
+        if ($1 >= 16) {
+            $process = 'mysqld';
+            $proc_owner = 'mysql';
+            $use_systemctl = 1;
+        }
+        if ($1 >= 19) {
+            $mysqldaemon ='mariadb';
+        }
+        if ($1 >= 34) {
+            $process = 'mariadb';
+        }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+        if ($1 >= 7) {
+            $mysqldaemon ='mariadb';
+            $process = 'mysqld';
+            $proc_owner = 'mysql';
+            $use_systemctl = 1;
+        }
+        if ($1 >= 9) {
+            $process = 'mariadb';
+        }
+    } elsif ($distro =~ /^sles(\d+)/) {
+        if ($1 >= 12) {
+            $use_systemctl = 1;
+            $proc_owner = 'mysql';
+            $process = 'mysqld';
+        }
+        if ($1 >= 15) {
+            $mysqldaemon ='mariadb';
+        }
+    } elsif ($distro =~ /^suse(\d+)/) {
+        if ($1 >= 13) {
+            $use_systemctl = 1;
+        }
     }
-    if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
+    if (open(PIPE,"ps -ef |grep $process |grep ^$proc_owner |grep -v grep 2>&1 |")) {
         my $status = <PIPE>;
         close(PIPE);
         chomp($status);
@@ -416,21 +674,35 @@ sub check_mysql_running {
             print_and_log(&mt('MySQL is running.')."\n");
             return 1;
         } else {
-            system("/etc/rc.d/init.d/$mysqldaemon start"); 
+            if ($use_systemctl) {
+                system("/bin/systemctl start $mysqldaemon.service >/dev/null 2>&1 ");
+            } else {
+                system("/etc/init.d/$mysqldaemon start >/dev/null 2>&1 ");
+            }
             print_and_log(&mt('Waiting for MySQL to start.')."\n");
             sleep 5;
-            if (open (PIPE, "/etc/init.d/$mysqldaemon 2>&1 |")) {
-                my $status = <PIPE>;
+            if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
+                $status = <PIPE>;
                 close(PIPE);
                 chomp($status);
-                if ($status =~ /\(pid\s+\d\)/) {
+                if ($status =~ /^\Q$proc_owner\E\s+\d+\s+/) {
                     print_and_log(&mt('MySQL is running.')."\n");
                     return 1;
                 } else {
-                    print_and_log(&mt('Unable to start MySQL.')."\n"); 
+                    print_and_log(&mt('Still waiting for MySQL to start.')."\n");
+                    sleep 5;
+                    if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
+                        $status = <PIPE>;
+                        close(PIPE);
+                        chomp($status);
+                        if ($status =~ /^\Q$proc_owner\E\s+\d+\s+/) {
+                            print_and_log(&mt('MySQL is running.')."\n");
+                            return 1;
+                        } else {
+                            print_and_log(&mt('Given up waiting for MySQL to start.')."\n"); 
+                        }
+                    }
                 }
-            } else {
-                print_and_log(&mt('Unable to start MySQL.')."\n");
             }
         }
     } else {
@@ -440,9 +712,10 @@ sub check_mysql_running {
 }
 
 sub chkconfig {
-    my ($distro) = @_;
-    my (%needfix,%tostop);
+    my ($distro,$instdir) = @_;
+    my (%needfix,%tostop,%uses_systemctl);
     my $checker_bin = '/sbin/chkconfig';
+    my $sysctl_bin = '/bin/systemctl';
     my %daemon = (
                   mysql     => 'mysqld',
                   apache    => 'httpd',
@@ -457,69 +730,157 @@ sub chkconfig {
         @norunlevels = qw/0 2 1 6/;
         $daemon{'mysql'} = 'mysql';
         $daemon{'apache'} = 'apache2';
+        $daemon{'ntp'}    = 'ntp';
         if ($distro =~ /^(suse|sles)9/) {
             $daemon{'apache'} = 'apache';
         }
+        if ($distro =~ /^(suse|sles)([\d\.]+)/) {
+            my $name = $1;
+            my $num = $2;
+            if ($num > 11) {
+                $uses_systemctl{'apache'} = 1;
+                if (($name eq 'sles') || ($name eq 'suse' && $num >= 13.2)) {
+                    $uses_systemctl{'mysql'} = 1;
+                    $uses_systemctl{'ntp'} = 1;
+                    $uses_systemctl{'cups'} = 1;
+                    $uses_systemctl{'memcached'} = 1;
+                    if (($name eq 'sles') && ($num >= 15)) {
+                        $daemon{'ntp'} = 'chronyd';
+                        $daemon{'mysql'} = 'mariadb';
+                    } else {
+                        $daemon{'ntp'} = 'ntpd';
+                    }
+                }
+            }
+        }
     } elsif ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
         my $version = $1;
         @runlevels = qw/2 3 4 5/;
         @norunlevels = qw/0 1 6/;
-        $checker_bin = '/usr/sbin/sysv-rc-conf';
+        if (($distro =~ /^ubuntu/) && ($version <= 16)) {
+            $checker_bin = '/usr/sbin/sysv-rc-conf';
+        } else {
+            $uses_systemctl{'ntp'} = 1;
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+            $uses_systemctl{'memcached'} = 1;
+            $uses_systemctl{'cups'} = 1;
+        }
         $daemon{'mysql'}  = 'mysql';
         $daemon{'apache'} = 'apache2';
         $daemon{'ntp'}    = 'ntp';
         if (($distro =~ /^ubuntu/) && ($version <= 8)) {
             $daemon{'cups'} = 'cupsys';
         }
+        if ((($distro =~ /^ubuntu/) && ($version >= 18)) ||
+            (($distro  =~ /^debian/) && ($version >= 10))) {
+            $daemon{'ntp'}    = 'chrony';
+        }
+        if (($distro  =~ /^debian/) && ($version >= 11)) {
+            $daemon{'mysql'} = 'mariadb';
+        }
+    } elsif ($distro =~ /^fedora(\d+)/) {
+        my $version = $1;
+        if ($version >= 15) {
+            $uses_systemctl{'ntp'} = 1;
+        }
+        if ($version >= 16) {
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+            $uses_systemctl{'memcached'} = 1;
+            $uses_systemctl{'cups'} = 1;
+        }
+        if ($version >= 19) {
+            $daemon{'mysql'} = 'mariadb';
+        }
+        if ($version >= 26) {
+            $daemon{'ntp'} = 'chronyd';
+        }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+        my $version = $1;
+        if ($version >= 7) {
+            $uses_systemctl{'ntp'} = 1;
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+            $uses_systemctl{'memcached'} = 1;
+            $uses_systemctl{'cups'} = 1;
+            $daemon{'mysql'} = 'mariadb';
+        }
+        if (($version >= 8) || ($distro eq 'oracle7')) {
+            $daemon{'ntp'} = 'chronyd';
+        }
     }
+    my $nocheck;
     if (! -x $checker_bin) {
+        if ($uses_systemctl{'mysql'} && $uses_systemctl{'apache'}) {
+            if (! -x $sysctl_bin) {
+                $nocheck = 1;       
+            }
+        } else {
+            $nocheck = 1;
+        }
+    }
+    if ($nocheck) {
         print &mt('Could not check runlevel status for MySQL or Apache')."\n";
         return;
     }
     my $rlstr = join('',@runlevels);
     my $nrlstr = join('',@norunlevels);
+
     foreach my $type ('apache','mysql','ntp','cups','memcached') {
         my $service = $daemon{$type};
-        my $command = $checker_bin.' --list '.$service;
-        if ($type eq 'cups') { 
-            if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
-                my $version = $1;
-                if (($distro =~ /^ubuntu/) && ($version <= 8)) {
-                    $command = $checker_bin.' --list cupsys';
+        if ($uses_systemctl{$type}) {
+            if (($type eq 'memcached') || ($type eq 'cups')) {
+                if (-l "/etc/systemd/system/multi-user.target.wants/$service.service") {
+                    $tostop{$type} = 1;
                 }
-            }
-        }
-        my $results = `$command`;
-        my $tofix;
-        if ($results eq '') {
-            if (($type eq 'apache') || ($type eq 'mysql') || ($type eq 'ntp')) {
-                if ($distro  =~ /^(debian|ubuntu)/) {
-                    $tofix = "update-rc.d $type defaults";
-                } else {
-                    $tofix = "$checker_bin --add $service\n";
+            } else {
+                if (!-l "/etc/systemd/system/multi-user.target.wants/$service.service") {
+                    $needfix{$type} = "systemctl enable $service.service";
                 }
             }
         } else {
-            my %curr_runlevels;
-            for (my $rl=0; $rl<=6; $rl++) {
-                if ($results =~ /$rl:on/) { $curr_runlevels{$rl}++; }
+            my $command = $checker_bin.' --list '.$service.' 2>/dev/null';
+            if ($type eq 'cups') {
+                if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
+                    my $version = $1;
+                    if (($distro =~ /^ubuntu/) && ($version <= 8)) {
+                        $command = $checker_bin.' --list cupsys 2>/dev/null';
+                    }
+                }
             }
-            if (($type eq 'apache') || ($type eq 'mysql') || ($type eq 'ntp')) {
-                my $warning;
-                foreach my $rl (@runlevels) {
-                    if (!exists($curr_runlevels{$rl})) {
-                        $warning = 1;
+            my $results = `$command`;
+            my $tofix;
+            if ($results eq '') {
+                if (($type eq 'apache') || ($type eq 'mysql') || ($type eq 'ntp')) {
+                    if ($distro  =~ /^(debian|ubuntu)/) {
+                        $tofix = "update-rc.d $type defaults";
+                    } else {
+                        $tofix = "$checker_bin --add $service\n";
                     }
                 }
-                if ($warning) {
-                    $tofix = "$checker_bin --level $rlstr $service on\n";
+            } else {
+                my %curr_runlevels;
+                for (my $rl=0; $rl<=6; $rl++) {
+                    if ($results =~ /$rl:on/) { $curr_runlevels{$rl}++; }
+                }
+                if (($type eq 'apache') || ($type eq 'mysql') || ($type eq 'ntp')) {
+                    my $warning;
+                    foreach my $rl (@runlevels) {
+                        if (!exists($curr_runlevels{$rl})) {
+                            $warning = 1;
+                        }
+                    }
+                    if ($warning) {
+                        $tofix = "$checker_bin --level $rlstr $service on\n";
+                    }
+                } elsif (keys(%curr_runlevels) > 0) {
+                    $tostop{$type} = 1;
                 }
-            } elsif (keys(%curr_runlevels) > 0) {
-                $tostop{$type} = 1;
             }
-        }
-        if ($tofix) {
-            $needfix{$type} = $tofix;
+            if ($tofix) {
+                $needfix{$type} = $tofix;
+            }
         }
     }
     if ($distro =~ /^(suse|sles)([\d\.]+)$/) {
@@ -531,11 +892,59 @@ sub chkconfig {
         } else {
             $major = $version;
         }
-        if ($major > 10) {
-            $needfix{'insserv'} = &check_SuSEfirewall2_setup();
+        if (($major > 10) && ($major <= 13)) {
+            if (&check_SuSEfirewall2_setup($instdir)) {
+                $needfix{'insserv'} = 1;
+            }
+        }
+    }
+    return (\%needfix,\%tostop,\%uses_systemctl);
+}
+
+sub uses_firewalld {
+    my ($distro) = @_;
+    my ($inuse,$checkfirewalld,$zone);
+    if ($distro =~ /^(suse|sles)([\d\.]+)$/) {
+        if (($1 eq 'sles') && ($2 >= 15)) {
+            $checkfirewalld = 1;
+        }
+    } elsif ($distro =~ /^fedora(\d+)$/) {
+        if ($1 >= 18) {
+            $checkfirewalld = 1;
+        }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+        if ($1 >= 7) {
+            $checkfirewalld = 1;
+        }
+    }
+    if ($checkfirewalld) {
+        my ($loaded,$active);
+        if (open(PIPE,"systemctl status firewalld 2>/dev/null |")) {
+            while (<PIPE>) {
+                chomp();
+                if (/^\s*Loaded:\s+(\w+)/) {
+                    $loaded = $1;
+                }
+                if (/^\s*Active:\s+(\w+)/) {
+                    $active = $1;
+                }
+            }
+            close(PIPE);
+        }
+        if (($loaded eq 'loaded') || ($active eq 'active')) {
+            $inuse = 1;
+            my $cmd = 'firewall-cmd --get-default-zone';
+            if (open(PIPE,"$cmd |")) {
+                my $result = <PIPE>;
+                chomp($result);
+                close(PIPE);
+                if ($result =~ /^\w+$/) {
+                    $zone = $result;
+                }
+            }
         }
     }
-    return (\%needfix,\%tostop);
+    return ($inuse,$zone);
 }
 
 sub chkfirewall {
@@ -546,30 +955,44 @@ sub chkfirewall {
                     https => 443,
                 );
     my %activefw;
-    if (&firewall_is_active()) {
-        my $iptables = &get_pathto_iptables();
-        if ($iptables eq '') {
-            print &mt('Firewall not checked as path to iptables not determined.')."\n";
-        } else {
-            my @fwchains = &get_fw_chains($iptables,$distro);
-            if (@fwchains) {
-                foreach my $service ('http','https') {
-                    foreach my $fwchain (@fwchains) {
-                        if (&firewall_is_port_open($iptables,$fwchain,$ports{$service})) {
-                            $activefw{$service} = 1;
-                            last;
+    my ($firewalld,$zone) = &uses_firewalld($distro);
+    if ($firewalld) {
+        my %current;
+        if (open(PIPE,'firewall-cmd --permanent --zone='.$zone.' --list-services |')) {
+            my $svc = <PIPE>;
+            close(PIPE);
+            chomp($svc);
+            map { $current{$_} = 1; } (split(/\s+/,$svc));
+        }
+        if ($current{'http'} && $current{'https'}) {
+            $configfirewall = 0;
+        }
+    } else {
+        if (&firewall_is_active()) {
+            my $iptables = &get_pathto_iptables();
+            if ($iptables eq '') {
+                print &mt('Firewall not checked as path to iptables not determined.')."\n";
+            } else {
+                my @fwchains = &get_fw_chains($iptables,$distro);
+                if (@fwchains) {
+                    foreach my $service ('http','https') {
+                        foreach my $fwchain (@fwchains) {
+                            if (&firewall_is_port_open($iptables,$fwchain,$ports{$service})) {
+                                $activefw{$service} = 1;
+                                last;
+                            }
                         }
                     }
+                    if ($activefw{'http'}) {
+                        $configfirewall = 0;
+                    }
+                } else {
+                    print &mt('Firewall not checked as iptables Chains not identified.')."\n";
                 }
-                if ($activefw{'http'}) {
-                    $configfirewall = 0;
-                }
-            } else {
-                print &mt('Firewall not checked as iptables Chains not identified.')."\n";
             }
+        } else {
+            print &mt('Firewall not enabled.')."\n";
         }
-    } else {
-        print &mt('Firewall not enabled.')."\n";
     }
     return ($configfirewall,\%activefw);
 }
@@ -577,17 +1000,50 @@ sub chkfirewall {
 sub chkapache {
     my ($distro,$instdir) = @_;
     my $fixapache = 1;
-    if ($distro =~ /^(debian|ubuntu)/) {
-        if (!-e "$instdir/apache2.conf") {
+    if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+        my $distname = $1;
+        my $version = $2;
+        my ($stdconf,$stdsite);
+        if ((($distname eq 'ubuntu') && ($version > 12)) ||
+            (($distname eq 'debian') && ($version >= 10))) {
+            $stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf";
+            $stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites";
+        } else {
+            $stdconf = "$instdir/debian-ubuntu/loncapa"; 
+        }
+        if (!-e $stdconf) {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; 
-        } elsif ((-e "/etc/apache2/sites-available/loncapa") && (-e "$instdir/apache2.conf")) {
-            if (open(PIPE, "diff --brief $instdir/apache2.conf /etc/apache2/sites-available/loncapa |")) {
-                my $diffres = <PIPE>;
-                close(PIPE);
-                chomp($diffres);
-                unless ($diffres) {
-                    $fixapache = 0;
+        } else {
+            my ($configfile,$sitefile);
+            if ((($distname eq 'ubuntu') && ($version > 12)) ||
+                (($distname eq 'debian') && ($version >= 10))) {
+                $sitefile = '/etc/apache2/sites-available/loncapa.conf';
+                $configfile = '/etc/apache2/conf-available/loncapa.conf';
+            } else {
+                $configfile = '/etc/apache2/sites-available/loncapa';
+            }
+            if (($configfile ne '') && (-e $configfile) && (-e $stdconf))  {
+                if (open(PIPE, "diff --brief $stdconf $configfile |")) {
+                    my $diffres = <PIPE>;
+                    close(PIPE);
+                    chomp($diffres);
+                    unless ($diffres) {
+                        $fixapache = 0;
+                    }
+                }
+            }
+            if ((!$fixapache) && ((($distname eq 'ubuntu') && ($version > 12)) ||
+                                  (($distname eq 'debian') && ($version >= 10))))  {
+                if (($sitefile ne '') && (-e $sitefile) && (-e $stdsite)) {
+                    if (open(PIPE, "diff --brief $stdsite $sitefile |")) {
+                        my $diffres = <PIPE>;
+                        close(PIPE);
+                        chomp($diffres);
+                        unless ($diffres) {
+                            $fixapache = 0;
+                        }
+                    }
                 }
             }
         }
@@ -598,16 +1054,49 @@ sub chkapache {
                 }
             }
         }
-    } elsif ($distro =~ /^(?:suse|sles)([\d\.]+)$/) {
+        if ((!$fixapache) && (($distname eq 'ubuntu') || ($distname eq 'debian'))) {
+            my $sitestatus = "/etc/apache2/mods-available/status.conf";
+            my $stdstatus = "$instdir/debian-ubuntu/status.conf";
+            if ((-e $stdstatus) && (-e $sitestatus)) {
+                if (open(PIPE, "diff --brief $stdstatus $sitestatus |")) {
+                    my $diffres = <PIPE>;
+                    close(PIPE);
+                    chomp($diffres);
+                    if ($diffres) {
+                        $fixapache = 1;
+                    }
+                }
+            }
+        }
+    } elsif ($distro =~ /^(suse|sles)([\d\.]+)$/) {
+        my ($name,$version) = ($1,$2);
         my $apache = 'apache';
-        if ($1 >= 10) {
-            my $apache = 'apache2';
+        my $conf_file = "$instdir/sles-suse/default-server.conf";
+        if ($version >= 10) {
+            $apache = 'apache2';
         }
-        if (!-e "$instdir/default-server.conf") {
+        if (($name eq 'sles') && ($version >= 12)) {
+            $conf_file = "$instdir/sles-suse/apache2.4/default-server.conf";
+        }
+        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") && (-e "$instdir/default-server.conf")) {
-            if (open(PIPE, "diff --brief $instdir/default-server.conf /etc/$apache/default-server.conf |")) {
+        } elsif (-e "/etc/$apache/default-server.conf") {
+            if (open(PIPE, "diff --brief $conf_file /etc/$apache/default-server.conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                unless ($diffres) {
+                    $fixapache = 0;
+                }
+            }
+        }
+    } elsif ($distro eq 'rhes4') {
+        if (!-e "$instdir/rhes4/httpd.conf") {
+            $fixapache = 0;
+            print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
+        } elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/rhes4/httpd.conf")) {
+            if (open(PIPE, "diff --brief $instdir/rhes4/httpd.conf /etc/httpd/conf/httpd.conf |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -617,11 +1106,26 @@ sub chkapache {
             }
         }
     } else {
-        if (!-e "$instdir/httpd.conf") {
+        my $configfile = 'httpd.conf';
+        my $mpmfile = 'mpm.conf';
+        if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+            if ($1 >= 7) {
+                $configfile = 'apache2.4/httpd.conf';
+            } elsif ($1 > 5) {
+                $configfile = 'new/httpd.conf';
+            }
+        } elsif ($distro =~ /^fedora(\d+)$/) {
+            if ($1 > 17) {
+                $configfile = 'apache2.4/httpd.conf';
+            } elsif ($1 > 10) {
+                $configfile = 'new/httpd.conf';
+            }
+        }
+        if (!-e "$instdir/centos-rhes-fedora-sl/$configfile") {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
-        } elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/httpd.conf")) {
-            if (open(PIPE, "diff --brief $instdir/httpd.conf /etc/httpd/conf/httpd.conf |")) {
+        } elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/centos-rhes-fedora-sl/$configfile")) {
+            if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/$configfile /etc/httpd/conf/httpd.conf |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -630,10 +1134,316 @@ 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;
 }
 
+#
+# chkapachessl() determines whether a server's Apache SSL configuration
+# needs updating to support LON-CAPA.
+#
+# LON-CAPA uses VirtualHosts for port 443, and requires that they are 
+# defined in one Apache configuration file containing two VirtualHost
+# blocks, in order:
+#
+# (1) a block with no ServerName, or with ServerName set to the
+#     server's hostname. This block should contain:
+#
+# <IfModule mod_rewrite.c>
+# LON-CAPA rewrite rules defined in sslrewrite.conf
+# </IfModule>
+#
+# (2) a block with ServerName set to internal-$hostname
+#     (where $hostname is server's hostname).
+#    This block should contain the config and rewrite rules
+#    found in loncapassl.conf.
+#
+# chkapachessl() retrieves the names of .conf files in
+# the directory appropriate for the particular Linux distro,
+# and then checks to see which .conf file is the best candidate as
+# the single file containing VirtualHosts definitions and 
+# <IfModule mod_rewrite.c> </IfModule> rewrite blocks.
+#
+# The best candidate is the one containing a block:
+# <VirtualHost ????? :443> 
+# (where ????? might be _default_ or * or an IP address)
+# <IfModule mod_rewrite.c>
+# </IfModule>
+# </VirtualHost>
+# with the fewest differences between the contents of the 
+# IfModule block and the expected contents (from sslrewrite.conf)
+#
+# If there are no files with rewrite blocks, then a candidate file 
+# is chosen from the .conf files containing VirtualHosts definitions.
+#
+# If the user includes "Configure SSL for Apache web server" as
+# one of the actions to take to prepare the server for LON-CAPA
+# installation, then the output from &chkapachessl() will be
+# used to determined which file will contain VirtualHost configs.  
+#
+# If there are no files containing VirtualHosts definitions, then
+# <VirtualHost *:443> </VirtualHost> blocks will be appended to
+# the standard Apache SSL config for the particular distro:
+# ssl.conf for RHEL/CentOS/Scientific/Fedora, vhost-ssl.conf
+# for SuSE/SLES, and default-ssl.conf for Ubuntu.
+#
+# Once a file is selected, the contents of sslrewrite.conf and 
+# loncapassl.conf are compared with appropriate blocks in the file
+# and the user will be prompted to agree to insertion of missing
+# lines and/or deletion of surplus lines.
+#
+
+sub chkapachessl {
+    my ($distro,$instdir,$hostname,$hostip) = @_;
+    my $fixapachessl = 1;
+    my $sslintconf = "$instdir/loncapassl.conf";
+    my $sslrewriteconf = "$instdir/sslrewrite.conf";
+    my (%sslfiles,%rewrites,%vhostonly,$has_std,$has_int,$rewritenum,$nochgint,$nochgstd);
+    $nochgstd = 0;
+    $nochgint = 0; 
+    if (!-e $sslintconf) {
+        $fixapachessl = 0;
+        print &mt('Warning: LON-CAPA SSL Apache configuration file [_1] needed for installation check.',$sslintconf)."\n";
+    } elsif (!-e $sslrewriteconf) {
+        $fixapachessl = 0;
+        print &mt('Warning: LON-CAPA SSL Apache configuration file [_1] needed for installation check is missing.',$sslrewriteconf)."\n";
+    } else {
+        my $ssldir;
+        if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+            $ssldir = '/etc/apache2/sites-available';
+        } elsif ($distro =~ /(suse|sles)/) {
+            $ssldir = '/etc/apache2/vhosts.d';
+        } else {
+            $ssldir = '/etc/httpd/conf.d';
+        }
+        my @rewritessl = ();
+        if (open(my $fh,'<',$sslrewriteconf)) {
+            my $skipnext = 0;
+            while (<$fh>) {
+                chomp();
+                s/(^\s+|\s+$)//g;
+                next if ($_ eq '');
+                next if ($_ eq '<IfModule mod_rewrite.c>');
+                next if ($_ eq '</IfModule>');
+                if ($_ eq 'RewriteCond %{REMOTE_ADDR} {[[[[HostIP]]]]}') {
+                    if (($hostip ne '') && ($hostip ne '127.0.0.1')) {
+                        push(@rewritessl,'RewriteCond %{REMOTE_ADDR} '.$hostip);
+                        next;
+                    } else {
+                        $skipnext = 1;
+                    }
+                } elsif (($_ eq 'RewriteRule (.*) - [L]') && ($skipnext)) {
+                    $skipnext = 0;
+                    next;
+                }
+                push(@rewritessl,$_);
+            }
+        }
+        my @intssl = ();
+        if (open(my $fh,'<',$sslintconf)) {
+            while(<$fh>) {
+                chomp();
+                s/(^\s+|\s+$)//g;
+                next if ($_ eq '');
+                if ($_ eq 'ServerName internal-{[[[[Hostname]]]]}') {
+                    if ($hostname ne '') {
+                        push(@intssl,'ServerName internal-'.$hostname);
+                        next;
+                    }
+                }
+                next if ($_ eq '<VirtualHost *:443>');
+                next if ($_ eq '</VirtualHost>');
+                push(@intssl,$_);
+            }
+        }
+        if (-d $ssldir) {
+            my @actualint = ();
+            if (opendir(my $dir,$ssldir)) {
+                my @sslconf_files;
+                foreach my $file (grep(!/^\.+/,readdir($dir))) {
+                    next if (($distro =~ /(suse|sles)/) && ($file =~ /\.template$/));
+                    next if ($file =~ /\.rpmnew$/);
+                    if (open(my $fh,'<',"$ssldir/$file")) {
+                        while (<$fh>) {
+                            if (/^\s*<VirtualHost\s+[^:]*\:443>\s*$/) {
+                                push(@sslconf_files,$file);
+                                last;
+                            }
+                        }
+                        close($fh);
+                    }
+                }
+                closedir($dir);
+                if (@sslconf_files) {
+                    foreach my $file (@sslconf_files) {
+                        if (open(my $fh,'<',"$ssldir/$file")) {
+                            my ($virtualhost,$rewrite,$num) = (0,0,0);
+                            my ($currname,$has_rewrite);
+                            while (<$fh>) {
+                                chomp();
+                                next if (/^\s*$/);
+                                if ($virtualhost) {
+                                    if (/^\s*<\/VirtualHost>/) {
+                                        if ($currname !~ /^\Qinternal-$hostname\E/) {
+                                            if ($has_rewrite) {
+                                                delete($vhostonly{$file});
+                                            } else {
+                                                $vhostonly{$file} = 1;
+                                            }
+                                        }
+                                        $sslfiles{$currname}{$file} = 1;
+                                        $virtualhost = 0;
+                                        $currname = '';
+                                        $has_rewrite = '';
+                                        next;
+                                    } elsif (/^\s*ServerName\s+([^\s]+)\s*$/) {
+                                        $currname = $1;
+                                    }
+                                    if ($currname =~ /^\Qinternal-$hostname\E/) {
+                                        s/(^\s+|\s+$)//g;
+                                        push(@actualint,$_);
+                                        $has_int = $file;
+                                    } else {
+                                        if ($rewrite) {
+                                            if (/^\s*<\/IfModule>/) {
+                                                $rewrite = 0;
+                                                $num ++;
+                                            } else {
+                                                s/(^\s+|\s+$)//g;
+                                                push(@{$rewrites{$file}[$num]},$_);
+                                            }
+                                        } elsif (/^\s*<IfModule\s+mod_rewrite\.c>/) {
+                                            $rewrite = 1;
+                                            $has_rewrite = 1;
+                                            if ($currname eq '') {
+                                                $currname = $hostname;
+                                            }
+                                            $rewrites{$file}[$num] = [];
+                                        }
+                                    }
+                                } elsif (/^\s*<VirtualHost\s+[^:]*\:443>\s*$/) {
+                                    $virtualhost = 1;
+                                }
+                            }
+                            close($fh);
+                        }
+                    }
+                }
+                if (keys(%rewrites)) {
+                    my $mindiffsall;
+                    foreach my $file (sort(keys(%rewrites))) {
+                        if (ref($rewrites{$file}) eq 'ARRAY') {
+                            my $mindiffs;
+                            for (my $i=0; $i<@{$rewrites{$file}}; $i++) {
+                                if (ref($rewrites{$file}[$i]) eq 'ARRAY') {
+                                    my @diffs = &compare_arrays($rewrites{$file}[$i],\@rewritessl);
+                                    if (@diffs == 0) {
+                                        $fixapachessl = 0;
+                                        $mindiffs = 0;
+                                        $rewritenum = 1+$i;
+                                        last;
+                                    } else {
+                                        if ($mindiffs eq '') {
+                                            $mindiffs = scalar(@diffs);
+                                            $rewritenum = 1+$i; 
+                                        } elsif (scalar(@diffs) <= $mindiffs) {
+                                            $mindiffs = scalar(@diffs);
+                                            $rewritenum = 1+$i;
+                                        }
+                                    }
+                                }
+                            }
+                            if ($mindiffsall eq '') {
+                                $mindiffsall = $mindiffs;
+                                $has_std = $file;
+                            } elsif ($mindiffs <= $mindiffsall) {
+                                $mindiffsall = $mindiffs;
+                                $has_std = $file;
+                            }
+                            if ($mindiffsall == 0) {
+                                $nochgstd = 1;
+                            }
+                        }
+                    }
+                } elsif (keys(%vhostonly) > 0) {
+                    if (($has_int ne '') && (exists($vhostonly{$has_int}))) {
+                        $has_std = $has_int;
+                    }
+                }
+                if (@actualint) {
+                    my @diffs = &compare_arrays(\@actualint,\@intssl);
+                    if (@diffs) {
+                        $fixapachessl = 1;
+                    } else {
+                        $nochgint = 1;
+                    }
+                } else {
+                    $fixapachessl = 1;
+                }
+            }
+        }
+        unless ($fixapachessl) {
+            if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+                my $enabled_dir = '/etc/apache2/sites-enabled';
+                if (keys(%sslfiles)) {
+                    foreach my $key (sort(keys(%sslfiles))) {
+                        if (ref($sslfiles{$key}) eq 'HASH') {
+                            foreach my $file (sort(keys(%{$sslfiles{$key}}))) {
+                                unless ((-l "$enabled_dir/$file") &&
+                                        (readlink("$enabled_dir/$file") eq "$ssldir/$file")) {
+                                    if ($distro =~ /^debian(\d+)$/) {
+                                        print_and_log(&mt("Warning, use: 'a2ensite $file' to activate LON-CAPA SSL Apache config\n"));
+                                    } elsif ($distro =~ /^ubuntu(\d+)$/) {
+                                        print_and_log(&mt("Warning, use: 'sudo a2ensite $file' to activate LON-CAPA SSL Apache config\n"));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($fixapachessl,\%sslfiles,$has_std,$has_int,$rewritenum,$nochgstd,$nochgint);
+}
+
+#
+# compare_arrays() expects two refs to arrays as args.
+#
+# The contents of the two arrays are compared, and if they
+# are different, and array of the differences is returned.
+#
+
+sub compare_arrays {
+    my ($arrayref1,$arrayref2) = @_;
+    my (@difference,%count);
+    @difference = ();
+    %count = ();
+    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
+        foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
+        foreach my $element (keys(%count)) {
+            if ($count{$element} == 1) {
+                push(@difference,$element);
+            }
+        }
+    }
+    return @difference;
+}
+
 sub chksrvcs {
     my ($distro,$tostop) = @_;
     my %stopsrvcs;
@@ -652,20 +1462,30 @@ sub chksrvcs {
             chomp($daemonrunning);
             close(PIPE);
             if ($daemonrunning) {
-                $stopsrvcs{$service} = 1;
+                if ($service eq 'memcached') {
+                    my $cmd = '/usr/bin/memcached';
+                    if ($distro =~ /^(suse|sles)/) {
+                        $cmd = '/usr/sbin/memcached';
+                    }
+                    unless ($daemonrunning =~ m{^www[^/]+\Q$cmd -m 400 -v\E$}) {
+                        $stopsrvcs{$service} = 1;
+                    }
+                } else {
+                    $stopsrvcs{$service} = 1;
+                }
             }
         }
-    } 
+    }
     return \%stopsrvcs;
 }
 
 sub need_download {
+    my ($distro,$instdir) = @_;
     my $needs_download = 1;
     my ($production,$testing,$stdsizes) = &download_versionslist();
-    my ($rootdir,$localcurrent,$localtesting,%tarball,%localsize,%bymodtime,
+    my ($localcurrent,$localtesting,%tarball,%localsize,%bymodtime,
         %bysize,$filetouse,$downloadstatus);
-    $rootdir = '/root';
-    if (opendir(my $dir,"$rootdir")) {
+    if (opendir(my $dir,$instdir)) {
         my (@lcdownloads,$version);
         foreach my $file (readdir($dir)) {
             if ($file =~ /^loncapa\-([\w\-.]+)\.tar\.gz$/) {
@@ -675,14 +1495,14 @@ sub need_download {
             }
             if (ref($stdsizes) eq 'HASH') {
                 if ($version eq 'current') {
-                    my @stats = stat("$rootdir/$file");
+                    my @stats = stat("$instdir/$file");
                     $localcurrent = $stats[7];
                     if ($localcurrent == $stdsizes->{$production}) {
                         $needs_download = 0;
                         $filetouse = $file;
                     }
                 } elsif ($version eq 'testing') {
-                    my @stats = stat("$rootdir/$file");
+                    my @stats = stat("$instdir/$file");
                     $localtesting = $stats[7];
                     if ($localtesting == $stdsizes->{$testing}) {
                         $needs_download = 0;
@@ -696,7 +1516,7 @@ sub need_download {
         if ($needs_download) {
             if (@lcdownloads > 0) {
                 foreach my $version (@lcdownloads) {
-                    my @stats = stat("$rootdir/$tarball{$version}");
+                    my @stats = stat("$instdir/$tarball{$version}");
                     my $mtime = $stats[9];
                     $localsize{$version} = $stats[7];
                     if ($mtime) {
@@ -729,33 +1549,92 @@ sub need_download {
                     my $newest = $sorted[0];
                     if (ref($bymodtime{$newest}) eq 'ARRAY') {
                         $downloadstatus = 
-                              "Latest LON-CAPA source download in $rootdir is: ".
+                              "Latest LON-CAPA source download in $instdir is: ".
                               join(',',@{$bymodtime{$newest}})." (downloaded ".
                               localtime($newest).")\n";
                     }
                 } else {
                     $downloadstatus = 
-                        "The $rootdir directory already contains the latest LON-CAPA version:".
+                        "The $instdir directory already contains the latest LON-CAPA version:".
                         "\n".$filetouse."\n"."which can be used for installation.\n";
                 }
             } else {
-                $downloadstatus = "The $rootdir directory does not appear to contain any downloaded LON-CAPA source code files which can be used for installation.\n";
+                $downloadstatus = "The $instdir directory does not appear to contain any downloaded LON-CAPA source code files which can be used for installation.\n";
             }
         }
     } else {
-        $downloadstatus = "Could not open $rootdir directory to look for existing downloads of LON-CAPA source code.\n";
+        $downloadstatus = "Could not open $instdir directory to look for existing downloads of LON-CAPA source code.\n";
     }
     return ($needs_download,$downloadstatus,$filetouse,$production,$testing);
 }
 
 sub check_mysql_setup {
-    my ($instdir,$dsn) = @_;
-    my ($mysqlsetup,$has_pass);
+    my ($instdir,$dsn,$distro) = @_;
+    my ($mysqlsetup,$has_pass,$mysql_unix_socket,$mysql_has_wwwuser);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    if (($mysqlname =~ /^MariaDB/i) && (($mysqlversion == 10 && $mysqlminorversion >= 4) || ($mysqlversion >= 11))) {
+        if ($dbh) {
+            my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')");
+            $sth->execute();
+            while (my $priv = $sth->fetchrow_array) {
+                if ($priv =~ /unix_socket/) {
+                    $mysql_unix_socket = 1;
+                    last;
+                }
+            }
+            $sth->finish();
+            if ($mysql_unix_socket) {
+                print_and_log(&mt('MariaDB using unix_socket for root access from localhost.')."\n");
+                $mysqlsetup = 'rootok';
+                $mysql_has_wwwuser = &check_mysql_wwwuser($dbh);
+                return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket);
+            }
+        }
+    }
     if ($dbh) {
-        $mysqlsetup = 'noroot'; 
+        $mysqlsetup = 'noroot';
+        if (($mysqlname !~ /^MariaDB/i) && (($mysqlversion == 5 && $mysqlminorversion >= 7) || ($mysqlversion >= 6))) {
+            my $sth = $dbh->prepare("SELECT plugin from mysql.user where User='root'");
+            $sth->execute();
+            while (my $priv = $sth->fetchrow_array) {
+                if ($priv =~ /auth_socket/) {
+                    $mysql_unix_socket = 1;
+                    last;
+                }
+            }
+            $sth->finish();
+            if ($mysql_unix_socket) {
+                print_and_log(&mt('MySQL using unix_socket for root access from localhost.')."\n");
+                $mysqlsetup = 'rootok';
+                $mysql_has_wwwuser = &check_mysql_wwwuser($dbh);
+                return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket);
+            }
+        }
     } elsif ($DBI::err =~ /1045/) {
         $has_pass = 1;
+    } elsif ($distro =~ /^ubuntu(\d+)$/) {
+        my $version = $1;
+        if ($1 > 12) {
+            print_and_log(&mt('Restarting mysql, please be patient')."\n");
+            if (open (PIPE, "service mysql restart 2>&1 |")) {
+                while (<PIPE>) {
+                    print $_;
+                }
+                close(PIPE);
+            }
+            $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
+            if ($dbh) {
+                $mysqlsetup = 'noroot';
+                $mysql_has_wwwuser = &check_mysql_wwwuser($dbh);
+            } elsif ($DBI::err =~ /1045/) {
+                $has_pass = 1;
+            } else {
+                $mysqlsetup = 'needsrestart';
+                $mysql_has_wwwuser = &check_mysql_wwwuser();
+                return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser);
+            }
+        }
     }
     if ($has_pass) {
         print &mt('You have already set a root password for the MySQL database.')."\n";
@@ -764,6 +1643,7 @@ sub check_mysql_setup {
         if ($dbh) {
             $mysqlsetup = 'rootok';
             print_and_log(&mt('Password accepted.')."\n");
+            $mysql_has_wwwuser = &check_mysql_wwwuser($dbh);
         } else {
             $mysqlsetup = 'rootfail';
             print_and_log(&mt('Problem accessing MySQL.')."\n");
@@ -775,26 +1655,35 @@ sub check_mysql_setup {
                 if ($dbh) {
                     $mysqlsetup = 'rootok';
                     print_and_log(&mt('Password accepted.')."\n");
+                    $mysql_has_wwwuser = &check_mysql_wwwuser($dbh);
                 } else {
                     if ($DBI::err =~ /1045/) {
                         print_and_log(&mt('Incorrect password.')."\n");
                     }
+                    $mysql_has_wwwuser = &check_mysql_wwwuser();
                 }
             }
         }
-     } elsif ($mysqlsetup ne 'noroot') {
+    } elsif ($mysqlsetup ne 'noroot') {
         print_and_log(&mt('Problem accessing MySQL.')."\n");
         $mysqlsetup = 'rootfail';
+        $mysql_has_wwwuser = &check_mysql_wwwuser();
     }
-    return ($mysqlsetup,$has_pass,$dbh);
+    return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser);
 }
 
 sub check_mysql_wwwuser {
+    my ($dbh) = @_;
     my $mysql_wwwuser;
-    my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey');
-    if ($dbhn) {
-        $mysql_wwwuser = 1;
-        $dbhn->disconnect;
+    if ($dbh) {
+        $mysql_wwwuser = $dbh->selectrow_array("SELECT COUNT(User) FROM mysql.user WHERE (User = 'www' AND Host ='localhost')");
+    } else {
+        my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
+                                {PrintError => +0}) || return;
+        if ($dbhn) {
+            $mysql_wwwuser = 1;
+            $dbhn->disconnect;
+        }
     }
     return $mysql_wwwuser;
 }
@@ -830,10 +1719,32 @@ sub get_pathto_iptables {
 
 sub firewall_is_active {
     if (-e '/proc/net/ip_tables_names') {
-        return 1;
-    } else {
-        return 0;
+        my $status;
+        if (open(PIPE,'cat /proc/net/ip_tables_names |grep filter |')) {
+            $status = <PIPE>;
+            close(PIPE);
+            chomp($status);
+            if ($status eq 'filter') {
+                return 1;
+            }
+        }
+        unless ($status) {
+            if (open(PIPE,'nft list tables |')) {
+                while(<PIPE>) {
+                    chomp();
+                    if (/filter$/) {
+                        $status = 1;
+                        last;
+                    }
+                }
+                close(PIPE);
+                if ($status) {
+                    return 1;
+                }
+            }
+        }
     }
+    return 0;
 }
 
 sub get_fw_chains {
@@ -849,6 +1760,8 @@ sub get_fw_chains {
             @posschains = ('ufw-user-input','INPUT');
         } elsif ($distro =~ /^debian5/) {
             @posschains = ('INPUT');
+        } elsif ($distro =~ /^(suse|sles)(\d+)/) {
+            @posschains = ('IN_public');
         } else {
             @posschains = ('RH-Firewall-1-INPUT','INPUT');
             if (!-e '/etc/sysconfig/iptables') {
@@ -928,8 +1841,8 @@ sub get_mysql_password {
 sub check_SuSEfirewall2_setup {
     my ($instdir) = @_;
     my $need_override = 1;
-    if ((-e "/etc/insserv/overrides/SuSEfirewall2_setup") && (-e "$instdir/SuSEfirewall2_setup")) {
-        if (open(PIPE, "diff --brief $instdir/SuSEfirewall2_setup /etc/insserv/overrides/SuSEfirewall2_setup  |")) {
+    if ((-e "/etc/insserv/overrides/SuSEfirewall2_setup") && (-e "$instdir/sles-suse/SuSEfirewall2_setup")) {
+        if (open(PIPE, "diff --brief $instdir/sles-suse/SuSEfirewall2_setup /etc/insserv/overrides/SuSEfirewall2_setup  |")) {
             my $diffres = <PIPE>;
             close(PIPE);
             chomp($diffres);
@@ -991,11 +1904,12 @@ print "
 ".&mt('3.')." ".&mt('Set-up the MySQL database.')."
 ".&mt('4.')." ".&mt('Set-up MySQL permissions.')."
 ".&mt('5.')." ".&mt('Configure Apache web server.')."
-".&mt('6.')." ".&mt('Configure start-up of services.')."
-".&mt('7.')." ".&mt('Check firewall settings.')."
-".&mt('8.')." ".&mt('Stop services not used by LON-CAPA,')."
+".&mt('6.')." ".&mt('Configure SSL for Apache web server.')."
+".&mt('7.')." ".&mt('Configure start-up of services.')."
+".&mt('8.')." ".&mt('Check firewall settings.')."
+".&mt('9.')." ".&mt('Stop services not used by LON-CAPA,')."
    ".&mt('i.e., services for a print server: [_1] daemon.',"'cups'")."
-".&mt('9.')." ".&mt('Download LON-CAPA source code in readiness for installation.')."
+".&mt('10.')." ".&mt('Download LON-CAPA source code in readiness for installation.')."
 
 ".&mt('Typically, you will run this script only once, when you first install LON-CAPA.')." 
 
@@ -1025,33 +1939,43 @@ chomp($instdir);
 
 my %callsub;
 my @actions = ('wwwuser','pwauth','mysql','mysqlperms','apache',
-               'runlevels','firewall','stopsrvcs','download');
+               'apachessl','runlevels','firewall','stopsrvcs','download');
 my %prompts = &texthash( 
     wwwuser    => "Create the 'www' user?",
     pwauth     => 'Install the package LON-CAPA uses to authenticate users?',
     mysql      => 'Set-up the MySQL database?',
     mysqlperms => 'Set-up MySQL permissions?',
     apache     => 'Configure Apache web server?',
+    apachessl  => 'Configure SSL for Apache web server?',
     runlevels  => 'Set overrides for start-up order of services?',
     firewall   => 'Configure firewall settings for Apache',
     stopsrvcs  => 'Stop extra services not required on a LON-CAPA server?',
     download   => 'Download LON-CAPA source code in readiness for installation?',
 );
 
-print "\n".&mt('Checking system status ...')."\n";
+print "\n".&mt('Checking system status ...')."\n\n";
 
 my $dsn = "DBI:mysql:database=mysql";
-my ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$recommended,
-    $dbh,$has_pass,$has_lcdb,$downloadstatus,$filetouse,$production,
-    $testing,$apachefw) = &check_required($instdir,$dsn);
+my ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart,
+    $recommended,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,$downloadstatus,
+    $filetouse,$production,$testing,$apachefw,$uses_systemctl,$hostname,$hostip,
+    $sslhostsfiles,$has_std,$has_int,$rewritenum,$nochgstd,$nochgint) =
+    &check_required($instdir,$dsn);
 if ($distro eq '') {
     print "\n".&mt('Linux distribution could not be verified as a supported distribution.')."\n".
           &mt('The following are supported: [_1].',
               'CentOS, RedHat Enterprise, Fedora, Scientific Linux, '.
-              'openSuSE, SLES, Ubuntu LTS, Debian')."\n\n".
+              'Oracle Linux, openSuSE, SLES, Ubuntu LTS, Debian')."\n\n".
           &mt('Stopping execution.')."\n";
     exit;
 }
+if ($mysqlrestart) {
+    print "\n".&mt('The mysql daemon needs to be restarted using the following command:')."\n".
+          $mysqlrestart."\n\n".
+          &mt('Stopping execution of install.pl script.')."\n".
+          &mt('Please run the install.pl script again, once you have restarted mysql.')."\n";
+    exit;
+}
 if ($localecmd ne '') {
     print "\n".&mt('Although the LON-CAPA application itself is localized for a number of different languages, the default locale language for the Linux OS on which it runs should be US English.')."\n";
     print "\n".&mt('Run the following command from the command line to set the default language for your OS, and then run this LON-CAPA installation set-up script again.')."\n\n".
@@ -1060,11 +1984,10 @@ if ($localecmd ne '') {
     exit;
 }
 if (!$gotprereqs) {
-    print "\n".&mt('The LONCAPA-prequisites package is not installed.')."\n".
+    print "\n".&mt('The LONCAPA-prerequisites package is not installed.')."\n".
           &mt('The following command can be used to install the package (and dependencies):')."\n\n".
           $updatecmd."\n\n";
     if ($installnow eq '') {
-        print &mt('Stopping execution.')."\n";
         exit;
     } else {
         print &mt('Run command? ~[Y/n~]');
@@ -1074,17 +1997,18 @@ if (!$gotprereqs) {
                 close(PIPE);
                 $gotprereqs = &check_prerequisites($packagecmd,$distro);
                 if (!$gotprereqs) {
-                    print &mt('The LONCAPA-prequisites package is not installed.')."\n".
+                    print &mt('The LONCAPA-prerequisites package is not installed.')."\n".
                           &mt('Stopping execution.')."\n";
                     exit;
                 } else {
                     ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-                     $recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
-                     $filetouse,$production,$testing,$apachefw) = 
-                     &check_required($instdir,$dsn);
+                     $mysqlrestart,$recommended,$dbh,$has_pass,$mysql_unix_socket,
+                     $has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
+                     $uses_systemctl,$hostname,$hostip,$sslhostsfiles,$has_std,$has_int,
+                     $rewritenum,$nochgstd,$nochgint) = &check_required($instdir,$dsn);
                 }
             } else {
-                print &mt('Failed to run command to install LONCAPA-prequisites')."\n";
+                print &mt('Failed to run command to install LONCAPA-prerequisites')."\n";
                 exit;
             }
         } else {
@@ -1135,26 +2059,41 @@ my $lctarball = 'loncapa-current.tar.gz'
 my $sourcetarball = $lctarball;
 if ($callsub{'download'}) {
     my ($production,$testing,$sizes) = &download_versionslist();
+    my $homedir = '/root';
+    if ($distro =~ /^ubuntu/) {
+        if ($instdir ne $homedir) {
+            ($homedir) = ($instdir =~ m{^(.*)/[^/]+$});
+        }
+    }
     if ($production && $testing) {
         if ($production ne $testing) {
             print &mt('Two recent LON-CAPA releases are available: ')."\n".
                   &mt('1.').' '.&mt('A production release - version: [_1].',$production)."\n".
                   &mt('2.').' '.&mt('A testing release - version: [_1].',$testing)."\n\n".
-                  &mt('Download the production release? ~[Y/n~]');
+                  &mt("After download, the tar.gz file will be extracted into $homedir")."\n\n".
+                  &mt("Download the production release into $instdir? ~[Y/n~]");
             if (&get_user_selection(1)) {
                 $sourcetarball = 'loncapa-'.$production.'.tar.gz';
+                print "$sourcetarball will be downloaded into $instdir\n";
             } else {
                 print "\n".&mt('Download the testing release? ~[Y/n~]');
                 if (&get_user_selection(1)) {
                     $sourcetarball = 'loncapa-'.$testing.'.tar.gz';
+                    print "$sourcetarball will be downloaded into $instdir\n";
+                } else {
+                    $callsub{'download'} = 0;
                 }
             }
         }
     } elsif ($production) {
         print &mt('The most recent LON-CAPA release is version: [_1].',$production)."\n".
-              &mt('Download the production release? ~[Y/n~]');
+              &mt("After download, the tar.gz file will be extracted into $homedir")."\n\n".
+              &mt("Download the production release into $instdir? ~[Y/n~]");
         if (&get_user_selection(1)) {
-            $sourcetarball = $production.'tar.gz';
+            $sourcetarball = 'loncapa-'.$production.'.tar.gz';
+            print "$sourcetarball will be downloaded into $instdir\n";
+        } else {
+            $callsub{'download'} = 0;
         }
     }
 } elsif ($filetouse ne '') {
@@ -1178,7 +2117,8 @@ if ($callsub{'pwauth'}) {
 
 if ($callsub{'mysql'}) {
     if ($dbh) {
-        &setup_mysql($callsub{'mysqlperms'},$distro,$dbh,$has_pass,$has_lcdb);
+        &setup_mysql($callsub{'mysqlperms'},$dbh,$has_pass,
+                     $mysql_unix_socket,$has_lcdb,$distro);
     } else {
         print &mt('Unable to configure MySQL because access is denied.')."\n";
     }
@@ -1186,7 +2126,7 @@ if ($callsub{'mysql'}) {
     &print_and_log(&mt('Skipping configuration of MySQL.')."\n");
     if ($callsub{'mysqlperms'}) {
         if ($dbh) {
-            &setup_mysql_permissions($dbh,$has_pass);
+            &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket);
         } else {
             print &mt('Unable to configure MySQL because access is denied.')."\n";  
         }
@@ -1204,16 +2144,53 @@ if ($dbh) {
 
 if ($callsub{'apache'}) {
     if ($distro =~ /^(suse|sles)/) {
-        &copy_apache2_suseconf($instdir);
+        &copy_apache2_suseconf($instdir,$hostname,$distro);
     } elsif ($distro =~ /^(debian|ubuntu)/) {
-        &copy_apache2_debconf($instdir);
+        &copy_apache2_debconf($instdir,$distro,$hostname);
     } else {
-        &copy_httpd_conf($instdir);
+        &copy_httpd_conf($instdir,$distro,$hostname);
+        &copy_mpm_conf($instdir,$distro);
     }
 } else {
     print_and_log(&mt('Skipping configuration of Apache web server.')."\n");
 }
 
+if ($callsub{'apachessl'}) {
+    my $targetdir = '/etc/httpd/conf.d';
+    if ($distro =~ /^(suse|sles)/) {
+        $targetdir = '/etc/apache2/vhosts.d';
+    } elsif ($distro =~ /^(debian|ubuntu)/) {
+        $targetdir = '/etc/apache2/sites-available';
+    }
+    my ($new_rewrite,$new_int) = 
+        &copy_apache_sslconf_files($distro,$hostname,$hostip,$instdir,$targetdir,$sslhostsfiles,
+                                   $has_std,$has_int,$rewritenum,$nochgstd,$nochgint); 
+    if ($distro =~ /^(debian|ubuntu)/) {
+        my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
+        if (-d $apache2_sites_enabled_dir) {  
+            if ($has_std ne '') {
+                unless ((-l "$apache2_sites_enabled_dir/$has_std") && (readlink(("$apache2_sites_enabled_dir/$has_std") eq "$targetdir/$has_std"))) {
+                    my $made_symlink =  eval { symlink("$targetdir/$has_std","$apache2_sites_enabled_dir/$has_std"); 1};
+                    if ($made_symlink) {
+                        print_and_log(&mt('Enabling "[_1]" Apache SSL configuration.',$has_std)."\n");
+                    }
+                }
+            }
+            if (($has_int ne '') && ($has_int ne $has_std)) {
+                unless ((-l "$apache2_sites_enabled_dir/$has_int") && (readlink("$apache2_sites_enabled_dir/$has_int") eq "$targetdir/$has_int")) {
+                    my $made_symlink =  eval { symlink("$targetdir/$has_int","$apache2_sites_enabled_dir/$has_int"); 1 };
+                    if ($made_symlink) {
+                        print_and_log(&mt('Enabling "[_1]" Apache SSL configuration.',$has_int)."\n");
+                    }
+                }
+            }
+        }
+    }
+    print_and_log("\n");
+} else {
+    print_and_log(&mt('Skipping configuration of SSL for Apache web server.')."\n");
+}
+
 if ($callsub{'runlevels'}) {
     my $count = 0;
     if (ref($recommended) eq 'HASH') {
@@ -1232,16 +2209,53 @@ if ($callsub{'runlevels'}) {
             }  
         }
     }
-    &update_SuSEfirewall2_setup($instdir);
+    if ($distro =~ /^(suse|sles)(\d+)/) {
+        unless(($1 eq 'sles') && ($2 >= 15)) {
+            &update_SuSEfirewall2_setup($instdir);
+        }
+    }
 } else {
     &print_and_log(&mt('Skipping setting override for start-up order of services.')."\n");
 }
 
 if ($callsub{'firewall'}) {
-    if ($distro =~ /^(suse|sles)/) {
+    my ($firewalld,$zone) = &uses_firewalld($distro);
+    if ($firewalld) {
+        my (%current,%added);
+        if (open(PIPE,"firewall-cmd --permanent --zone=$zone --list-services |")) {
+            my $svc = <PIPE>;
+            close(PIPE);
+            chomp($svc);
+            map { $current{$_} = 1; } (split(/\s+/,$svc));
+        }
+        foreach my $service ('http','https') {
+            unless ($current{$service}) {
+                if (open(PIPE,"firewall-cmd --permanent --zone=$zone --add-service=$service |")) {
+                    my $result = <PIPE>;
+                    if ($result =~ /^success/) {
+                        $added{$service} = 1;
+                    }
+                }
+            }
+        }
+        if (keys(%added) > 0) {
+            print &mt('Firewall configured to allow access for: [_1].',
+                      join(', ',sort(keys(%added))))."\n";
+            system('firewall-cmd --reload');
+        }
+        if ($current{'http'} || $current{'https'}) {
+            print &mt('Firewall already configured to allow access for:[_1].',
+                      (($current{'http'})? ' http':'').(($current{'https'})? ' https':''))."\n";
+        }
+        unless ($current{'ssh'}) {
+            print &mt('If you would like to allow access to ssh from outside, use the commands:')."\n".
+                  "firewall-cmd --permanent --zone=$zone --add-service=ssh\n".
+                  "firewall-cmd --reload\n";
+        }
+    } elsif ($distro =~ /^(suse|sles)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
                   'yast -- Security and Users -> Firewall -> Interfaces',
-                   'ssh, http, https')."\n";
+                  'ssh, http, https')."\n";
     } elsif ($distro =~ /^(debian|ubuntu)(\d+)/) {
         if (($1 eq 'ubuntu') || ($2 > 5)) {
             print &mt('Use [_1] to configure the firewall to allow access for [_2].',
@@ -1258,19 +2272,33 @@ if ($callsub{'firewall'}) {
                 }
             }
         }
-    } else {
+    } elsif ($distro =~ /^(scientific|oracle)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
-                  'setup -- Firewall confiuration -> Customize',
-                  'ssh, http, https')."\n";
+                  'system-config-firewall-tui -- Customize',
+                  'ssh, http')."\n";
+    } else {
+        my $version;
+        if ($distro =~ /^(redhat|centos)(\d+)/) {
+            $version = $1;
+        }
+        if ($version > 5) {
+            print &mt('Use [_1] to configure the firewall to allow access for [_2].',
+                  'system-config-firewall-tui -- Customize',
+                  'ssh, http')."\n";
+        } else {
+            print &mt('Use [_1] to configure the firewall to allow access for [_2].',
+                      'setup -- Firewall configuration -> Customize',
+                      'ssh, http, https')."\n";
+        }
     }
 } else {
     &print_and_log(&mt('Skipping Firewall configuration.')."\n");
 }
 
 if ($callsub{'stopsrvcs'}) {
-    &kill_extra_services($distro,$recommended->{'stopsrvcs'});
+    &kill_extra_services($distro,$recommended->{'stopsrvcs'},$uses_systemctl);
 } else {
-    &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemon).',"'cups'")."\n");
+    &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemons).',"'cups','memcached'")."\n");
 }
 
 my ($have_tarball,$updateshown);
@@ -1281,10 +2309,11 @@ if ($callsub{'download'}) {
     print &mt('LON-CAPA is available for download from: [_1]',
               'http://install.loncapa.org/')."\n";
     if (!-e '/etc/loncapa-release') {
-        &print_and_log(&mt('LON-CAPA is not yet installed on your system.'). 
-                       "\n\n". 
-                       &mt('You may retrieve the source for LON-CAPA by executing:')."\n".
-                       "wget http://install.loncapa.org/versions/$lctarball\n");
+        &print_and_log(&mt('LON-CAPA is not yet installed on your system.')."\n\n");
+        unless ($filetouse) {
+            &print_and_log(&mt('You may retrieve the source for LON-CAPA by executing:')."\n".
+                           "wget http://install.loncapa.org/versions/$lctarball\n");
+        }
     } else {
         my $currentversion;
         if (open(my $fh,"</etc/loncapa-release")) {
@@ -1311,32 +2340,90 @@ if ($callsub{'download'}) {
 }
 
 print "\n".&mt('Requested configuration complete.')."\n\n";
-my $apachename;
 if ($have_tarball && !$updateshown) {
     my ($lcdir) = ($sourcetarball =~ /^([\w.\-]+)\.tar.gz$/);
-    if (!-e '/etc/loncapa-release') {
-        print &mt('If you are now ready to install LON-CAPA, enter the following commands:')."\n\n";
-    } else {
-        print &mt('If you are now ready to update LON-CAPA, enter the following commands:')."\n\n".
-                  "/etc/init.d/loncontrol stop\n";
-        if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) {
-            if (($1 eq 'suse') && ($2 < 10)) {
-                $apachename = 'apache';
-            } else {
-                $apachename = 'apache2';
-            }
+    if ($lcdir eq 'loncapa-current') {
+        $lcdir = "loncapa-X.Y.Z (X.Y.Z should correspond to a version number like '2.11.3')";
+    }
+    my ($apachename,$lc_uses_systemctl,$uses_sudo);
+    if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) {
+        if (($1 eq 'suse') && ($2 < 10)) {
+            $apachename = 'apache';
         } else {
-            $apachename = 'httpd';
+            $apachename = 'apache2';
+        }
+    } else {
+        $apachename = 'httpd';
+    }
+    if ($distro =~ /^oracle(\d+)$/) {
+        if ($1 > 6) {
+            $lc_uses_systemctl = 1;
+        }
+    } elsif ($distro =~ /^(?:rhes|centos|rocky|alma)(\d+)/) {
+        if ($1 > 7) {
+            $lc_uses_systemctl = 1;
+        }
+    } elsif ($distro =~ /^ubuntu(\d+)$/) {
+        if ($1 > 16) {
+            $lc_uses_systemctl = 1;
+        }
+        $uses_sudo = 1;
+    } elsif ($distro =~ /^debian(\d+)$/) {
+        if ($1 >= 10) {
+            $lc_uses_systemctl = 1;
+        }
+    } elsif ($distro =~ /^sles(\d+)$/) {
+        if ($1 > 12) {
+            $lc_uses_systemctl = 1;
         }
-        print "/etc/init.d/$apachename stop\n";
     }
-    print "cd /root\n".
-          "tar zxf $sourcetarball\n".
-          "cd $lcdir\n".
-          "./UPDATE\n";
+    if (!-e '/etc/loncapa-release') {
+        print &mt('If you are now ready to install LON-CAPA, enter the following commands:')."\n\n";
+    } else {
+        my $lcstop = '/etc/init.d/loncontrol stop';
+        if ($lc_uses_systemctl) {
+            $lcstop = 'systemctl stop loncontrol';
+        }
+        my $apachestop = "/etc/init.d/$apachename stop";
+        if ($uses_systemctl) {
+            $apachestop = "systemctl stop $apachename";
+        }
+        if ($uses_sudo) {
+            $lcstop = 'sudo '.$lcstop;
+            $apachestop = 'sudo '.$apachestop;
+        }
+        print &mt('If you are now ready to update LON-CAPA, enter the following commands:').
+              "\n\n$lcstop\n$apachestop\n";
+    }
+    my ($extract,$update);
+    my $homedir = '/root';
+    if ($uses_sudo) {
+        $extract = 'sudo ';
+        $update = 'sudo ';
+        if ($instdir ne $homedir) {
+            ($homedir) = ($instdir =~ m{^(.*)/[^/]+$});
+        }
+    }
+    $extract .= "tar zxf $sourcetarball --directory $homedir";
+    $update .= './UPDATE';
+    print "$extract\n".
+          "cd $homedir/$lcdir\n".
+          "$update\n";
     if (-e '/etc/loncapa-release') {
-        print "/etc/init.d/loncontrol start\n";
-        print "/etc/init.d/$apachename start\n";
+        my $lcstart = '/etc/init.d/loncontrol start';
+        if ($lc_uses_systemctl) {
+            $lcstart = '/home/httpd/perl/loncontrol start';
+        }
+        my $apachestart = "/etc/init.d/$apachename start";
+        if ($uses_systemctl) {
+            $apachestart = "systemctl start $apachename";
+        }
+        if ($uses_sudo) {
+            $lcstart = 'sudo '.$lcstart;
+            $apachestart = 'sudo '.$apachestart;
+        }
+        print "$lcstart\n";
+        print "$apachestart\n";
     }
 }
 exit;
@@ -1405,6 +2492,29 @@ sub build_and_install_mod_auth_external
 > #define SERVER_UIDS $num		/* user "www" */
 ENDPATCH
 
+    my $patch_code = <<"ENDPATCH";
+127a128
+> #include <string.h>
+214a216
+> #include <time.h>
+566c568
+< check_fails()
+---
+> int check_fails()
+589c591
+< log_failure()
+---
+> void log_failure()
+629c631
+< snooze(int seconds)
+---
+> void snooze(int seconds)
+653c655
+< main(int argc, char **argv)
+---
+> int main(int argc, char **argv)
+ENDPATCH
+
     if (! -e "/usr/bin/patch") {
 	print_and_log(&mt('You must install the software development tools package: [_1], when installing Linux.',"'patch'")."\n");
         print_and_log(&mt('Authentication installation not completed.')."\n");
@@ -1415,15 +2525,23 @@ ENDPATCH
         return;
     }
     my $dir = "/tmp/pwauth-2.2.8";
+    my $patchedok;
     if (open(PATCH,"| patch $dir/config.h")) {
         print PATCH $patch;
         close(PATCH);
+        if (open(PATCH,"| patch $dir/pwauth.c")) {
+            print PATCH $patch_code;
+            close(PATCH);
+            $patchedok = 1;
+        }
+    }
+    if ($patchedok) {
         print_and_log("\n");
         ##
         ## Compile patched pwauth
         ##
         print_and_log(&mt('Compiling pwauth')."\n");
-        my $result = `cd $dir/; make`;
+        my $result = `cd $dir/; make 2>/dev/null `;
         my $expected = <<"END";
 gcc -g    -c -o pwauth.o pwauth.c
 gcc -o pwauth -g  pwauth.o -lcrypt
@@ -1455,7 +2573,7 @@ END
 }
 
 sub kill_extra_services {
-    my ($distro,$stopsrvcs) = @_;
+    my ($distro,$stopsrvcs,$uses_systemctl) = @_;
     if (ref($stopsrvcs) eq 'HASH') {
         my @stopping = sort(keys(%{$stopsrvcs}));
         if (@stopping) {
@@ -1472,14 +2590,46 @@ sub kill_extra_services {
                             if (($distro =~ /^ubuntu/) && ($version <= 8)) {
                                 $daemon = 'cupsys';
                             }
+                        } else {
+                            $daemon = 'cups';
+                        }
+                    }
+                    my $cmd = "ps -ef |grep '$daemon' |grep -v grep";
+                    if (open(PIPE,'-|',$cmd)) {
+                        my $daemonrunning = <PIPE>;
+                        chomp($daemonrunning);
+                        close(PIPE);
+                        if ($daemonrunning) {
+                            &print_and_log(`/etc/init.d/$daemon stop`);
                         }
                     }
-	            &print_and_log(`/etc/init.d/$daemon stop`);
 	            &print_and_log(&mt('Removing [_1] from startup.',$service)."\n");
-                    if ($distro =~ /^(debian|ubuntu)/) {
-                        &print_and_log(`update-rc.d -f $daemon remove`);
+                    if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
+                        my $version = $1;
+                        if ((($distro =~ /^ubuntu/) && ($version > 16)) ||
+                            (($distro =~ /^debian/) && ($version >= 10))) {
+                            if (ref($uses_systemctl) eq 'HASH') {
+                                if ($uses_systemctl->{$service}) {
+                                    if (`systemctl is-enabled $service`) {
+                                        &print_and_log(`systemctl disable $service`);
+                                    }
+                                }
+                            }
+                        } else {
+                            &print_and_log(`update-rc.d -f $daemon remove`);
+                        }
                     } else {
-	                &print_and_log(`chkconfig --del $service`);
+                        if (ref($uses_systemctl) eq 'HASH') {
+                            if ($uses_systemctl->{$service}) {
+                                if (`systemctl is-enabled $service`) {                          
+                                    &print_and_log(`systemctl disable $service`);
+                                }
+                            } else {
+                                &print_and_log(`/sbin/chkconfig --del $service`);
+                            }
+                        } else {
+	                    &print_and_log(`/sbin/chkconfig --del $service`);
+                        } 
                     }
                 }
             }
@@ -1489,17 +2639,27 @@ sub kill_extra_services {
 }
 
 sub setup_mysql {
-    my ($setup_mysql_permissions,$distro,$dbh,$has_pass,$has_lcdb) = @_;
+    my ($setup_mysql_permissions,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,$distro) = @_;
     my @mysql_lc_commands;
     unless ($has_lcdb) {
-        push(@mysql_lc_commands,"CREATE DATABASE loncapa");
+        my $createcmd = 'CREATE DATABASE loncapa';
+        if ($distro =~ /^sles(\d+)/) {
+            if ($1 > 11) {
+                $createcmd .= ' CHARACTER SET utf8 COLLATE utf8_general_ci';
+            }
+        } elsif ($distro =~ /^ubuntu(\d+)/) {
+            if ($1 > 16) {
+                $createcmd .= ' CHARACTER SET latin1 COLLATE latin1_swedish_ci';
+            }
+        }
+        push(@mysql_lc_commands,$createcmd);
     }
     push(@mysql_lc_commands,"USE loncapa");
     push(@mysql_lc_commands,qq{
-CREATE TABLE IF NOT EXISTS metadata (title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, creationdate DATETIME, lastrevisiondate DATETIME, owner TEXT, copyright TEXT, FULLTEXT idx_title (title), FULLTEXT idx_author (author), FULLTEXT idx_subject (subject), FULLTEXT idx_url (url), FULLTEXT idx_keywords (keywords), FULLTEXT idx_version (version), FULLTEXT idx_notes (notes), FULLTEXT idx_abstract (abstract), FULLTEXT idx_mime (mime), FULLTEXT idx_language (language), FULLTEXT idx_owner (owner), FULLTEXT idx_copyright (copyright)) TYPE=MYISAM
+CREATE TABLE IF NOT EXISTS metadata (title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, creationdate DATETIME, lastrevisiondate DATETIME, owner TEXT, copyright TEXT, domain TEXT, dependencies TEXT, modifyinguser TEXT, authorspace TEXT, lowestgradelevel TEXT, highestgradelevel TEXT, standards TEXT, count INT, course INT, course_list TEXT, goto INT, goto_list TEXT, comefrom INT, comefrom_list TEXT, sequsage INT, sequsage_list TEXT, stdno INT, stdno_list TEXT, avetries FLOAT, avetries_list TEXT, difficulty FLOAT, difficulty_list TEXT, disc FLOAT, disc_list TEXT, clear FLOAT, technical FLOAT, correct FLOAT, helpful FLOAT, depth FLOAT, hostname TEXT, FULLTEXT idx_title (title), FULLTEXT idx_author (author), FULLTEXT idx_subject (subject), FULLTEXT idx_url (url), FULLTEXT idx_keywords (keywords), FULLTEXT idx_version (version), FULLTEXT idx_notes (notes), FULLTEXT idx_abstract (abstract), FULLTEXT idx_mime (mime), FULLTEXT idx_language (language), FULLTEXT idx_owner (owner), FULLTEXT idx_copyright (copyright)) ENGINE=MYISAM
 });
     if ($setup_mysql_permissions) {
-        &setup_mysql_permissions($dbh,$has_pass,@mysql_lc_commands);
+        &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket,@mysql_lc_commands);
     } else {
         print_and_log(&mt('Skipping MySQL permissions setup.')."\n");
         if ($dbh) {
@@ -1516,9 +2676,42 @@ CREATE TABLE IF NOT EXISTS metadata (tit
 }
 
 sub setup_mysql_permissions {
-    my ($dbh,$has_pass,@mysql_lc_commands) = @_;
-    my $mysqlversion = &get_mysql_version();
-    my @mysql_commands = ("INSERT user (Host, User, Password) VALUES('localhost','www',password('localhostkey'));");
+    my ($dbh,$has_pass,$mysql_unix_socket,@mysql_lc_commands) = @_;
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($usescreate,$usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
+    if ($mysqlname =~ /^MariaDB/i) {
+        $is_mariadb = 1;
+        if ((($mysqlversion == 10) && ($mysqlminorversion >= 4)) || ($mysqlversion >= 11)) {
+            $usescreate = 1;
+        } elsif (($mysqlversion == 10) && ($mysqlminorversion >= 2)) { 
+            $usesauth = 1;
+        } elsif (($mysqlversion == 5) && ($mysqlminorversion >= 5)) {
+            $hasauthcol = 1;
+        }
+    } else {
+        if (($mysqlversion > 5) || (($mysqlminorversion == 5) && ($mysqlminorversion > 7)) ||
+            (($mysqlversion == 5) && ($mysqlminorversion == 7) && ($mysqlsubver > 5))) {
+            $usesauth = 1;
+        } elsif (($mysqlversion == 5) &&
+                 (($mysqlminorversion >= 6) || (($mysqlminorversion == 5) && ($mysqlsubver >= 7)))) {
+            $hasauthcol = 1;
+        }
+    }
+    if ($usescreate) {
+        @mysql_commands = ("CREATE USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
+    } elsif ($usesauth) {
+        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')",
+                           "FLUSH PRIVILEGES");
+        if ($is_mariadb) {
+            push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
+        } else {
+            push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED WITH mysql_native_password BY 'localhostkey'");
+        }
+    } elsif ($hasauthcol) {
+        @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');");
+    } else {
+        @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject) VALUES('localhost','www',password('localhostkey'),'','','');");
+    }
     if ($mysqlversion < 4) {
         push (@mysql_commands,"
 INSERT db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv) VALUES('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y')");
@@ -1527,7 +2720,7 @@ INSERT db (Host,Db,User,Select_priv,Inse
 INSERT db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv,Create_tmp_table_priv,Lock_tables_priv) VALUES('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y')");
     }
     push(@mysql_commands,"DELETE FROM user WHERE host<>'localhost'");
-    if ($has_pass) {
+    if (($has_pass) || ($mysql_unix_socket)) {
         if ($dbh) {
             push(@mysql_commands,"FLUSH PRIVILEGES");
             if (@mysql_commands) {
@@ -1568,7 +2761,7 @@ INSERT db (Host,Db,User,Select_priv,Inse
             }
         }
         if ($got_passwd) {
-            my (@newpass_cmds) = &new_mysql_rootpasswd($newmysqlpass);
+            my (@newpass_cmds) = &new_mysql_rootpasswd($newmysqlpass,$usesauth,$is_mariadb);
             push(@mysql_commands,@newpass_cmds);
         } else {
             print_and_log(&mt('Failed to get MySQL root password from user input.')."\n");
@@ -1577,7 +2770,6 @@ INSERT db (Host,Db,User,Select_priv,Inse
             if (@mysql_commands) {
                 foreach my $cmd (@mysql_commands) {
                     $dbh->do($cmd) || print $dbh->errstr."\n";
-
                 }
             }
             if (@mysql_lc_commands) {
@@ -1599,23 +2791,33 @@ INSERT db (Host,Db,User,Select_priv,Inse
 }
 
 sub new_mysql_rootpasswd {
-    my ($currmysqlpass) = @_;
-    return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')",
-            "FLUSH PRIVILEGES;");
+    my ($currmysqlpass,$usesauth,$is_mariadb) = @_;
+    if ($usesauth) {
+        if ($is_mariadb) {
+            return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",
+                    "FLUSH PRIVILEGES;");
+        } else {
+            return ("ALTER USER 'root'\@'localhost' IDENTIFIED WITH mysql_native_password BY '$currmysqlpass'",
+                    "FLUSH PRIVILEGES;");
+        }
+    } else {
+        return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')",
+                "FLUSH PRIVILEGES;");
+    }
 }
 
 sub get_mysql_version {
-    my $version;
+    my ($version,$minorversion,$subversion,$name);
     if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version) = ($info =~ /(\d+\.\d+)\.\d+,/);  
+        ($version,$minorversion,$subversion,$name) = ($info =~ /(\d+)\.(\d+)\.(\d+)(?:\-?(\w*),|)/);
     } else {
         print &mt('Could not determine which version of MySQL is installed.').
               "\n";
     }
-    return $version;
+    return ($version,$minorversion,$subversion,$name);
 }
 
 ###########################################################
@@ -1626,36 +2828,559 @@ sub get_mysql_version {
 ###########################################################
 
 sub copy_httpd_conf {
-    my ($instdir) = @_;
+    my ($instdir,$distro,$hostname) = @_;
+    my $configfile = 'httpd.conf';
+    if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+        if ($1 >= 7) {
+            $configfile = 'apache2.4/httpd.conf';
+        } elsif ($1 > 5) {
+            $configfile = 'new/httpd.conf';
+        }
+    } elsif ($distro =~ /^fedora(\d+)$/) {
+        if ($1 > 17) {
+            $configfile = 'apache2.4/httpd.conf';
+        } elsif ($1 > 10) {
+            $configfile = 'new/httpd.conf';
+        }
+    }
     print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'httpd.conf'",
                   "'/etc/httpd/conf/httpd.conf'")."\n");
     copy "/etc/httpd/conf/httpd.conf","/etc/httpd/conf/httpd.conf.original";
-    copy "$instdir/httpd.conf","/etc/httpd/conf/httpd.conf";
+    copy "$instdir/centos-rhes-fedora-sl/$configfile","/etc/httpd/conf/httpd.conf";
     chmod(0444,"/etc/httpd/conf/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|rocky|alma)(\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
+##
+###############################################
+
+#
+# The Apache SSL configuration used by LON-CAPA is contained in
+# two files: sslrewrite.conf and loncapassl.conf.
+#
+# Starting with LON-CAPA 2.12, name-based virtual hosts are used
+# with port 443. The default virtual host (i.e., the one listed
+# first) is for the server's standard hostname, and that is the one 
+# which will respond to client browser requests for https:// pages. 
+#
+# Accordingly, a system administrator will need to edit the config
+# config file to include paths to a signed SSL certificate (public), 
+# chain (public) and key (private) pem files. The certificate should
+# have been signed by a recognized certificate authority ((e.g., 
+# InCommon or Let's Encrypt).
+#  
+# The sslrewrite.conf file contains the rewrite configuration for
+# the default virtual host. The rewrite rules defined are used to 
+# allow internal HEAD requests to /cgi-bin/mimetex.cgi to be served
+# http://, in order to support vertical alignment of mimetex images
+# (one of the options for rendering Math content); (b) allow requests
+# for certain URLs (external resource, and syllabus, if external URL
+# used) to be served http:// to accommodate the use of iframes which 
+# would otherwise result in browser blocking of mixed active content.
+#
+# The loncapassl.conf file contains the configuration for the  
+# "internal" virtual host, which will respond to requests for https://
+# pages from other LON-CAPA servers in the network to which the node
+# belongs. The ServerName is internal-<hostname> where <hostname>
+# is the server's hostname. There is no need to create a DNS entry 
+# for internal-<hostname>, as LON-CAPA 2.12 automatically performs
+# the required hostname to IP mapping.
+# 
+# Requests to /raw on the "internal" virtual host require a valid
+# SSL client certificate, signed by the certificate authority
+# for the LON-CAPA network to which the node belongs.
+# 
+# The configuration file to which the contents of sslrewrite.conf
+# and loncapassl.conf will be written will have either been identified
+# when &chkapachessl() was run, or if no files were found with
+# existing rewrite blocks, then a candidate file will be chosen
+# from the .conf files containing VirtualHosts definitions.
+# If there is more than one suitable candidate file, the system
+# administrator will be prompted to select from the available files.
+#
+# If there are no files containing VirtualHosts definitions, then
+# <VirtualHost *:443> </VirtualHost> blocks will be appended to
+# the standard Apache SSL config for the particular distro:
+# ssl.conf for RHEL/CentOS/Scientific/Fedora, vhost-ssl.conf
+# for SuSE/SLES, and default-ssl.conf for Ubuntu.
+#
+# Once a file is selected, the contents of sslrewrite.conf and
+# loncapassl.conf are compared with appropriate blocks in the file
+# and the user will be prompted to agree to insertion of missing lines
+# and/or deletion of surplus lines.
+#
+
+sub copy_apache_sslconf_files {
+    my ($distro,$hostname,$hostip,$instdir,$targetdir,$targetfilesref,
+        $has_std,$has_int,$rewritenum,$nochgstd,$nochgint) = @_;
+    my ($new_std,$new_int);
+    my (@internal,@standard,%int_by_linenum,%int_by_linetext,
+        %rule_by_linenum,%rule_by_linetext,%foundint);
+    if (-e "$instdir/loncapassl.conf") {
+        if (open(my $fh,'<',"$instdir/loncapassl.conf")) {
+            my $num = 1;
+            while (<$fh>) {
+                chomp();
+                if (/^ServerName/) {
+                    s/(\Qinternal-{[[[[Hostname]]]]}\E)/internal-$hostname/;
+                }
+                push(@internal,$_);
+                $int_by_linenum{$num} = $_;
+                s/(^\s+|\s+$)//g;
+                push(@{$int_by_linetext{$_}},$num);
+                $num ++;
+            }
+            close($fh);
+        }
+    }
+    if (-e "$instdir/sslrewrite.conf") {
+        if (open(my $fh,'<',"$instdir/sslrewrite.conf")) {
+            my $num = 1;
+            while (<$fh>) {
+                chomp();
+                if (/\Q{[[[[HostIP]]]]}\E/) {
+                    s/(\QRewriteCond %{REMOTE_ADDR} {[[[[HostIP]]]]}\E)/RewriteCond %{REMOTE_ADDR} $hostip/;
+                }
+                push(@standard,$_);
+                $rule_by_linenum{$num} = $_;
+                s/(^\s+|\s+$)//g;
+                push(@{$rule_by_linetext{$_}},$num);
+                $num ++;
+            }
+            close($fh);
+        }
+    }
+    if (!$nochgstd) {
+        if ($has_std eq '') {
+            my $file;
+            if ($has_int ne '') {
+                if (open(my $fh,'<',"$targetdir/$has_int")) {
+                    my @saved = <$fh>;
+                    close($fh);
+                    if (open(my $fhout, '>',"$targetdir/$has_int")) {
+                        print $fhout "<VirtualHost *:443>\n".
+                                     "ServerName $hostname\n".
+                                     join("\n",@standard)."\n".
+                                     "</VirtualHost>\n\n".
+                                     join('',@saved);
+                        close($fhout);
+                        $new_int = $has_int; 
+                    }
+                }
+            }
+        } else {
+            if ($rewritenum eq '') {
+                &append_to_vhost($targetdir,$has_std,$hostname,\%rule_by_linenum,'std');
+                $new_std = $has_std;
+            } else {
+                $new_std = &modify_ssl_config($targetdir,$has_std,$hostname,$rewritenum,
+                                              \%rule_by_linetext,\%rule_by_linenum,'std');
+            }
+        }
+    }
+    if (!$nochgint) {
+        if ($has_int eq '') {
+            if ($has_std ne '') {
+                if (open(my $fhout,'>>',"$targetdir/$has_std")) {
+                    print $fhout "\n".join("\n",@internal)."\n";
+                    close($fhout);
+                    $new_int = $has_std;
+                }
+            }
+        } else {
+            $new_int = &modify_ssl_config($targetdir,$has_int,$hostname,$rewritenum,\%int_by_linetext,\%int_by_linenum,'int');
+        }
+    }
+    if (($has_std eq '') && ($has_int eq '')) {
+        my ($file,$numfiles) = &get_sslconf_filename($distro,$targetdir,$targetfilesref);
+        if ($numfiles == 0) { 
+            if (open(my $fhout, '>>', "$targetdir/$file")) {
+                print $fhout "<VirtualHost *:443>\n".
+                             "ServerName $hostname\n".
+                             join("\n",@standard)."\n".
+                             "</VirtualHost>\n\n".
+                             join("\n",@internal)."\n";
+                close($fhout);
+                $new_std = $file;
+                $new_int = $file;
+            }
+        } elsif ($numfiles == 1) {
+            &append_to_vhost($targetdir,$file,$hostname,\%rule_by_linenum,'std');
+            if (open(my $fhout, '>>', "$targetdir/$file")) {
+                print $fhout "\n".join("\n",@internal)."\n";
+                close($fhout);
+                $new_std = $file;
+                $new_int = $file;
+            }
+        } elsif ($numfiles == -1) {
+            print_and_log(&mt('Failed to copy contents of [_1] or [_2] to a file in [_3]',
+                              "'loncapassl.conf'","'sslrewrite.conf'","'$targetdir'")."\n");
+        }
+    }
+    if ($nochgstd) {
+        print_and_log(&mt('No change required to file: [_1] in [_2], (no difference between [_3] and rewrite block.)',
+                          "'$has_std'","'$targetdir'","'sslrewrite.conf'"));
+    }
+    if ($nochgint) {
+        print_and_log(&mt('No change required to file: [_1] in [_2], (no difference between [_3] and virtualhost block.)',
+                          "'$has_int'","'$targetdir'","'loncapassl.conf'"));
+    }
+    if ($new_int) {
+        print_and_log(&mt('Successfully copied contents of [_1] to [_2].',"'loncapassl.conf'","'$targetdir/$new_int'")."\n");
+        chmod(0444,"$targetdir/loncapassl.conf");
+    }
+    if ($new_std) {
+        print_and_log(&mt('Successfully copied contents of [_1] to [_2].',"'sslrewrite.conf'","'$targetdir/$new_std'")."\n");
+        chmod(0444,"$targetdir/loncapassl.conf");
+    }
+    return ($new_int,$new_std);
+}
+
+#
+# append_to_vhost() is called to add rewrite rules (in a 
+# <IfModule +mod_rewrite.c> </IfModule> block), provided
+# in the sslrewrite.conf configuration file, to an Apache
+# SSL configuration file within a VirtualHost for port 443
+# (for server's public-facing hostname).
+#
+sub append_to_vhost {
+    my ($targetdir,$filename,$hostname,$by_linenum,$type) = @_;
+    return unless (ref($by_linenum) eq 'HASH');
+    my ($startvhost,$endvhost);
+    if (-e "$targetdir/$filename") {
+        my (@lines,$currname,$virtualhost,$hasname);
+        if (open(my $fh,'<',"$targetdir/$filename")) {
+            my $currline = 0;
+            while (<$fh>) {
+                $currline ++;
+                push(@lines,$_);
+                chomp();
+                s/(^\s+|\s+$)//g;
+                if (/^<VirtualHost\s+[^:]*\:443>/) {
+                    $virtualhost = 1;
+                    unless ($endvhost) {
+                        $startvhost = $currline;
+                    }
+                }
+                if ($virtualhost) {
+                    if (/^ServerName\s+([^\s]+)\s*$/) {
+                        $currname = $1;
+                        unless ($endvhost) {
+                            if ((($currname eq '') || ($currname eq $hostname)) && ($type eq 'std')) {
+                                $hasname = 1;
+                            }
+                        }
+                    }
+                    if (/^<\/VirtualHost>/) {
+                        $virtualhost = 0;
+                        unless ($endvhost) {
+                            if (((($currname eq '') || ($currname eq $hostname)) && ($type eq 'std')) ||
+                                (($currname eq 'internal-'.$hostname) && ($type eq 'int'))) { 
+                                $endvhost = $currline;
+                            } else {
+                                undef($startvhost);  
+                            }
+                        }
+                    }
+                }
+            }
+            close($fh);
+        }
+        if ($endvhost) {
+            if (open(my $fout,'>',"$targetdir/$filename")) {
+                for (my $i=0; $i<@lines; $i++) {
+                    if ($i == $startvhost) {
+                        unless (($hasname) && ($type eq 'std')) {
+                            print $fout "ServerName $hostname\n";
+                        }
+                    }
+                    if ($i == $endvhost-1) {
+                        foreach my $item (sort { $a <=> $b } keys(%{$by_linenum})) {
+                            print $fout $by_linenum->{$item}."\n";
+                        }
+                    }
+                    print $fout $lines[$i];
+                }
+                close($fout);
+            }
+        }
+    }
+    return $endvhost;
+}
+
+#
+# get_sslconf_filename() is called when the Apache SSL configuration
+# option has been selected and there are no files containing
+# VirtualHost definitions containing rewrite blocks,
+# 
+# In this case get_sslconf_filename() is used to chose from the 
+# available .conf files containing VirtualHosts definitions. If
+# there is ambiguity about which file to use, &apacheconf_choice()
+# will be called to prompt the user to choose one of the possible
+# files.
+#
+
+sub get_sslconf_filename {
+    my ($distro,$targetdir,$targetfilesref) = @_;
+    my ($configfile,$numfiles,@possfiles);
+    if (ref($targetfilesref) eq 'HASH') {
+        if (keys(%{$targetfilesref}) > 0) {
+            foreach my $name (sort(keys(%{$targetfilesref}))) {
+                if (ref($targetfilesref->{$name}) eq 'HASH') {
+                    foreach my $file (sort(keys(%{$targetfilesref->{$name}}))) {
+                        next if ($file eq '');
+                        next if (!-e "$targetdir/$file");
+                        unless (grep(/^\Q$file\E$/,@possfiles)) {
+                            push(@possfiles,$file);
+                        }
+                    }
+                }
+            }
+        }
+        if (@possfiles == 0) {
+            $configfile = 'ssl.conf';
+            if ($distro =~ /^(suse|sles)/) {
+                $configfile = 'vhost-ssl.conf';
+            } elsif ($distro =~ /^(debian|ubuntu)/) {
+                $configfile = 'default-ssl.conf';
+            }
+            $numfiles = 0;
+            print &mt('No configuration files in [_1] contain a <VirtualHost *:443> </VirtualHost> block which can be used to house Apache rewrite rules from https to http.',$targetdir)."\n\n".
+                  &mt('Accordingly, the contents of sslrewrite.conf will be included in a <VirtualHost *:443> </VirtualHost> block which will be added to a file named: [_1].',$configfile)."\n\n";
+        } elsif (@possfiles == 1) {
+            $configfile = $possfiles[0];
+            $numfiles = 1;
+            print &mt('A single configuration file in [_1] contains a <VirtualHost *:443> </VirtualHost> block.',$targetdir)."\n".
+                  &mt('The contents of sslrewrite.conf will be added to this block.')."\n\n";
+        } else {
+            print &mt('More than one Apache config file contains a <VirtualHost *:443> </VirtualHost> block.')."\n\n".&mt('The possible files are:')."\n";
+            my $counter = 1;
+            my $max = scalar(@possfiles);
+            foreach my $file (@possfiles) {
+                print "$counter. $file\n";
+                $counter ++;
+            }
+            print "\n".&mt('Enter a number between 1 and [_1] to indicate which file should be modified to include the contents of sslrewrite.conf.',$max)."\n";
+            my $choice = &apacheconf_choice($max);
+            if (($choice =~ /^\d+$/) && ($choice >= 1) && ($choice <= $max)) {
+                $configfile = $possfiles[$choice-1];
+                $numfiles = 1; 
+            } else {
+                $numfiles = -1;
+            }
+        }
+    }
+    return ($configfile,$numfiles);
+}
+
+#
+# &apacheconf_choice() prompts a user to choose an integer between 1 and the  
+# maximum number of available of possible Apache SSL config files found
+# at the distros standard location for Apache config files containing
+# VirtualHost definitions.
+#
+# This routine is called recursively until the user enters a valid integer.
+#
+
+sub apacheconf_choice {
+    my ($max) = @_;
+    my $choice = <STDIN>;
+    chomp($choice);
+    $choice =~ s/(^\s+|\s+$)//g;
+    my $configfile;
+    if (($choice =~ /^\d+$/) && ($choice >= 1) && ($choice <= $max)) {
+        $configfile = $choice;
+    } 
+    while ($configfile eq '') {
+        print &mt('Invalid choice.  Please enter a number between 1 and [_1].',$max)."\n";
+        $configfile = &apacheconf_choice($max);
+    }
+    print "\n";
+    return $configfile;
+}
+
+#
+# &modify_ssl_config() is called to modify the contents of an Apache SSL config
+# file so that it has two <VirtualHost *:443> </VirtualHost> blocks containing
+# (a) the default VirtualHost with the <IfModule mod_rewrite.c> </IfModule> block 
+# provided in sslrewrites.conf, and (b) an "internal" VirtualHost with the 
+# content provided in loncapassl.conf.
+#
+# This routine will prompted you to agree to insertion of lines present in the
+# shipped conf file, but missing from the local config file, and also for
+# deletion of lines present in the local config file, but not required in
+# the shipped conf file.
+# 
+ 
+sub modify_ssl_config {
+    my ($targetdir,$filename,$hostname,$rewritenum,$by_linetext,$by_linenum,$type) = @_;
+    return unless ((ref($by_linetext) eq 'HASH') && (ref($by_linenum) eq 'HASH'));
+    if (-e "$targetdir/$filename") {
+        my (@lines,$virtualhost,$currname,$rewrite);
+        if (open(my $fh,'<',"$targetdir/$filename")) {
+            my %found;
+            my %possible;
+            my $currline = 0;
+            my $rewritecount = 0;
+            while (<$fh>) {
+                $currline ++;
+                push(@lines,$_);
+                chomp();
+                s/(^\s+|\s+$)//g;
+                if (/^\s*<VirtualHost\s+[^:]*\:443>\s*$/) {
+                    $virtualhost = 1;
+                }
+                if ($virtualhost) {
+                    if ((exists($by_linetext->{$_})) && (ref($by_linetext->{$_}) eq 'ARRAY') &&
+                        (@{$by_linetext->{$_}} > 0)) {
+                        $possible{$currline} = shift(@{$by_linetext->{$_}});
+                    } 
+                    if (/^\s*<\/VirtualHost>/) {
+                        if ((($currname eq 'internal-'.$hostname) && ($type eq 'int')) ||
+                            ((($currname eq $hostname) || ($currname eq '')) && ($type eq 'std') &&
+                              ($rewritecount == $rewritenum))) {
+                            %found = (%found,%possible);
+                        } else {
+                            foreach my $line (sort {$b <=> $a } keys(%possible)) {
+                                my $num = $possible{$line};
+                                if (ref($by_linetext->{$by_linenum->{$num}}) eq 'ARRAY') { 
+                                    unshift(@{$by_linetext->{$by_linenum->{$num}}},$num);
+                                }
+                            } 
+                        }
+                        undef(%possible);
+                        $virtualhost = 0;
+                        $currname = '';
+                    } elsif (/^\s*ServerName\s+([^\s]+)\s*$/) {
+                        $currname = $1;
+                    } elsif (/^\s*<IfModule\s+mod_rewrite\.c>/) {
+                        $rewrite = 1;
+                    } elsif (/^\s*<\/IfModule>/) {
+                        $rewritecount ++;
+                        $rewrite = 0;
+                    }
+                }
+            }
+            close($fh);
+            if (open(my $fout,'>',"$targetdir/$filename")) {
+                my $currline = 0;
+                my ($lastfound,$done);
+                my $numfound = 0;
+                foreach my $line (@lines) {
+                    $currline ++;
+                    if ($done) {
+                        print $fout $line;
+                    } elsif ($lastfound) {
+                        if ($found{$currline}) {
+                            for (my $i=$lastfound+1; $i<$found{$currline}; $i++) {
+                                print &mt('The following line is missing from the current <VirtualHost *:443> </VirtualHost> block:')."\n".
+                                      $by_linenum->{$i}."\n".
+                                      &mt('Add this line? ~[Y/n~]');
+                                if (&get_user_selection(1)) {
+                                    print $fout $by_linenum->{$i}."\n";
+                                }
+                            }
+                            $numfound ++;
+                            $lastfound = $found{$currline};
+                            print $fout $line;
+                            if ($numfound == scalar(keys(%found))) {
+                                $done = 1;
+                                for (my $i=$found{$currline}+1; $i<=scalar(keys(%{$by_linenum})); $i++) {
+                                    print &mt('The following line is missing from the current <VirtualHost *:443> </VirtualHost> block:')."\n".
+                                          $by_linenum->{$i}."\n".
+                                          &mt('Add this line? ~[Y/n~]');
+                                    if (&get_user_selection(1)) {
+                                        print $fout $by_linenum->{$i}."\n";
+                                    }
+                                }
+                            }
+                        } else {
+                            print &mt('The following line found within a <VirtualHost *:443> </VirtualHost> block does not match that expected by LON-CAPA:')."\n".
+                                  $line.
+                                  &mt('Delete this line? ~[Y/n~]');
+                            if (!&get_user_selection(1)) {
+                                print $fout $line;
+                            }
+                        }
+                    } elsif ($found{$currline}) {
+                        $numfound ++;
+                        $lastfound = $found{$currline};
+                        for (my $i=1; $i<$found{$currline}; $i++) {
+                            print &mt('The following line is missing from the current <VirtualHost *:443> </VirtualHost> block:')."\n".
+                                  $by_linenum->{$i}."\n".
+                                  &mt('Add this line? ~[Y/n~]');
+                            if (&get_user_selection(1)) {
+                                print $fout $by_linenum->{$i}."\n";
+                            }
+                        }
+                        print $fout $line;
+                    } else {
+                        print $fout $line;
+                    }
+                }
+                close($fout);
+            }
+        }
+    }
+    return $filename;
+}
+
 #########################################################
 ##
-## Ubuntu/Debian -- copy our apache2 configuration file to
+## Ubuntu/Debian -- copy our loncapa configuration file to
 ## sites-available and set the symlink from sites-enabled.
 ##
 #########################################################
 
 sub copy_apache2_debconf {
-    my ($instdir) = @_;
-    print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n");
-    my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
-    my $apache2_sites_available_dir = '/etc/apache2/sites-available';
-    if (-l "$apache2_sites_enabled_dir/000-default") {
-        unlink("$apache2_sites_enabled_dir/000-default");
-    }
-    if (-e "$apache2_sites_available_dir/loncapa") {
-        copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
-    }
-    copy("$instdir/apache2.conf","$apache2_sites_available_dir/loncapa");
-    chmod(0444,"$apache2_sites_available_dir/loncapa");
-    symlink("$apache2_sites_available_dir/loncapa","$apache2_sites_enabled_dir/000-default");
+    my ($instdir,$distro,$hostname) = @_;
     my $apache2_mods_enabled_dir = '/etc/apache2/mods-enabled';
     my $apache2_mods_available_dir = '/etc/apache2/mods-available';
     foreach my $module ('headers.load','expires.load') {
@@ -1664,6 +3389,197 @@ sub copy_apache2_debconf {
             print_and_log(&mt('Enabling "[_1]" Apache module.',$module)."\n");
         }
     }
+    my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
+    my $apache2_sites_available_dir = '/etc/apache2/sites-available';
+    my $defaultconfig = "$apache2_sites_enabled_dir/000-default";
+    my $defaultsite = "$apache2_sites_enabled_dir/loncapa.conf";
+    my ($distname,$version);
+    if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+        $distname = $1;
+        $version = $2;
+    }
+    if ((($distname eq 'ubuntu') && ($version > 12)) ||
+        (($distname eq 'debian') && ($version >= 10))) {
+        $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
+    }
+    my ($skipconf,$skipsite,$skipstatus);
+    if ((($distname eq 'ubuntu') && ($version > 12)) ||
+        (($distname eq 'debian') && ($version >= 10))) {
+        my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';
+        my $apache2_conf_available_dir = '/etc/apache2/conf-available';
+        my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
+        if ((-e "$apache2_conf_available_dir/loncapa") && (-e "$instdir/debian-ubuntu/ubuntu14/loncapa_conf")) {
+            if (open(PIPE, "diff --brief $apache2_conf_available_dir/loncapa $instdir/debian-ubuntu/ubuntu14/loncapa_conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.conf.original");
+                } else {
+                    copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.conf");
+                    chdir($apache2_conf_enabled_dir);
+                    symlink('../conf-available/loncapa.conf','loncapa.conf');
+                    chdir($instdir);
+                }
+                if (-l $defaultconf) {
+                    my $linkfname = readlink($defaultconf);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_conf_enabled_dir));
+                    }
+                    if ($linkfname eq "$apache2_conf_available_dir/loncapa") {
+                        unlink($defaultconf);
+                    }
+                }
+                unlink("$apache2_conf_available_dir/loncapa");
+            }
+        }
+        if ((-e "$apache2_conf_available_dir/loncapa.conf") && (-e "$instdir/debian-ubuntu/ubuntu14/loncapa_conf")) {
+            if (open(PIPE, "diff --brief $apache2_conf_available_dir/loncapa.conf $instdir/debian-ubuntu/ubuntu14/loncapa_conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_conf_available_dir/loncapa.conf","$apache2_conf_available_dir/loncapa.conf.original");
+                }
+                if (-l $defaultconf) {
+                    my $linkfname = readlink($defaultconf);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_conf_enabled_dir));
+                    }
+                    if ($linkfname eq "$apache2_conf_available_dir/loncapa.conf") {
+                        unless ($diffres) {
+                            $skipconf = 1;
+                        }
+                    }
+                }
+            }
+        }
+        unless ($skipconf) {
+            print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa.conf symlink'")."\n");
+            copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa.conf");
+            chmod(0444,"$apache2_conf_available_dir/loncapa.conf");
+            if (-l $defaultconf) {
+                unlink($defaultconf);
+            }
+            chdir($apache2_conf_enabled_dir);
+            symlink('../conf-available/loncapa.conf','loncapa.conf');
+            chdir($instdir);
+        }
+        my $stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_site";
+        if ((-e $stdsite) && (-e "$apache2_sites_available_dir/loncapa")) {
+            if (open(PIPE, "diff --brief $stdsite $apache2_sites_available_dir/loncapa |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.conf.original");
+                } else {
+                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.conf");
+                }
+                if (-l $defaultconfig) {
+                    my $linkfname = readlink($defaultconfig);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_sites_enabled_dir));
+                    }
+                    if ($linkfname eq "$apache2_sites_available_dir/loncapa") {
+                        unlink($defaultconfig);
+                    }
+                }
+                unlink("$apache2_sites_available_dir/loncapa");
+            }
+        }
+        if ((-e $stdsite) && (-e "$apache2_sites_available_dir/loncapa.conf")) {
+            if (open(PIPE, "diff --brief $stdsite $apache2_sites_available_dir/loncapa.conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_sites_available_dir/loncapa.conf","$apache2_sites_available_dir/loncapa.conf.original");
+                }
+                if (-l $defaultsite) {
+                    my $linkfname = readlink($defaultsite);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_sites_enabled_dir));
+                    }
+                    if ($linkfname eq "$apache2_sites_available_dir/loncapa.conf") {
+                        unless ($diffres) {
+                            $skipsite = 1;
+                        }
+                    }
+                }
+            }
+        }
+        unless ($skipsite) {
+            print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'loncapa.conf symlink'")."\n");
+            copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa.conf");
+            chmod(0444,"$apache2_sites_available_dir/loncapa.conf");
+            chdir($apache2_sites_enabled_dir);
+            symlink('../sites-available/loncapa.conf','loncapa.conf');
+            chdir($instdir);
+        }
+        if (-l $defaultconfig) {
+            my $linkfname = readlink($defaultconfig);
+            if ($linkfname ne '') {
+                $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_sites_enabled_dir));
+            }
+            if ($linkfname eq "$apache2_sites_available_dir/000-default.conf") {
+                unlink($defaultconfig);
+            }
+        }
+    } else {
+        if ((-e "$instdir/debian-ubuntu/loncapa") && (-e "$apache2_sites_available_dir/loncapa")) {
+            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa $apache2_sites_available_dir/loncapa |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
+                }
+                if (-l $defaultconfig) {
+                    my $linkfname = readlink($defaultconfig);
+                    if ($linkfname eq "$apache2_sites_available_dir/loncapa") {
+                        unless ($diffres) {
+                            $skipsite = 1;
+                        }
+                    }
+                }
+            }
+        }
+        unless ($skipsite) {
+            if (-l $defaultconfig) {
+                unlink($defaultconfig);
+            }
+            print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n");
+            if (-e "$instdir/debian-ubuntu/loncapa") {
+                copy("$instdir/debian-ubuntu/loncapa","$apache2_sites_available_dir/loncapa");
+                chmod(0444,"$apache2_sites_available_dir/loncapa");
+                symlink("$apache2_sites_available_dir/loncapa","$apache2_sites_enabled_dir/000-default");
+            }
+        }
+    }
+    if (($distname eq 'ubuntu') || ($distname eq 'debian')) {
+        my $sitestatus = "$apache2_mods_available_dir/status.conf";
+        my $stdstatus = "$instdir/debian-ubuntu/status.conf";
+        if ((-e $sitestatus) && (-e $stdstatus)) {
+            if (open(PIPE, "diff --brief $stdstatus $sitestatus |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_mods_available_dir/status.conf","$apache2_mods_available_dir/status.conf.original");
+                } else {
+                    $skipstatus = 1;
+                }
+            }
+        }
+        unless ($skipstatus) {
+            if (-e $stdstatus) {
+                print_and_log(&mt('Copying loncapa [_1] file to [_2],',"'status.conf'","'/etc/apache2/mods-available/status.conf'")."\n");
+                copy($stdstatus,$sitestatus);
+                chmod(0644,$sitestatus);
+            }
+        }
+    }
     print_and_log("\n");
 }
 
@@ -1676,14 +3592,19 @@ sub copy_apache2_debconf {
 ###########################################################
 
 sub copy_apache2_suseconf {
-    my ($instdir) = @_;
+    my ($instdir,$hostname,$distro) = @_;
+    my ($name,$version) = ($distro =~ /^(suse|sles)([\d\.]+)$/);
+    my $conf_file = "$instdir/sles-suse/default-server.conf";
+    if (($name eq 'sles') && ($version >= 12)) {
+        $conf_file = "$instdir/sles-suse/apache2.4/default-server.conf";
+    }
     print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',
                   "'default-server.conf'",
                   "'/etc/apache2/default-server.conf'")."\n");
     if (!-e "/etc/apache2/default-server.conf.original") {
         copy "/etc/apache2/default-server.conf","/etc/apache2/default-server.conf.original";
     }
-    copy "$instdir/default-server.conf","/etc/apache2/default-server.conf";
+    copy $conf_file,"/etc/apache2/default-server.conf";
     chmod(0444,"/etc/apache2/default-server.conf");
     # Make symlink for conf directory (included in loncapa_apache.conf)
     my $can_symlink = (eval { symlink('/etc/apache2','/srv/www/conf'); }, $@ eq '');
@@ -1694,7 +3615,7 @@ sub copy_apache2_suseconf {
         &print_and_log(&mt('Symlink creation failed for [_1] to [_2]. You will need to perform this action from the command line.',"'/srv/www/conf'","'/etc/apache2'")."\n");
     }
     &copy_apache2_conf_files($instdir);
-    &copy_sysconfig_apache2_file($instdir); 
+    &copy_sysconfig_apache2_file($instdir,$name,$version); 
     print_and_log("\n");
 }
 
@@ -1710,7 +3631,7 @@ sub copy_apache2_conf_files {
     if (!-e "/etc/apache2/uid.conf.original") {
         copy "/etc/apache2/uid.conf","/etc/apache2/uid.conf.original";
     }
-    copy "$instdir/uid.conf","/etc/apache2/uid.conf";
+    copy "$instdir/sles-suse/uid.conf","/etc/apache2/uid.conf";
     chmod(0444,"/etc/apache2/uid.conf");
 }
 
@@ -1720,12 +3641,16 @@ sub copy_apache2_conf_files {
 ##
 ###############################################
 sub copy_sysconfig_apache2_file {
-    my ($instdir) = @_;
+    my ($instdir,$name,$version) = @_;
     print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'sysconfig/apache2'","'/etc/sysconfig/apache2'")."\n");
     if (!-e "/etc/sysconfig/apache2.original") {
         copy "/etc/sysconfig/apache2","/etc/sysconfig/apache2.original";
     }
-    copy "$instdir/sysconfig_apache2","/etc/sysconfig/apache2";
+    my $sysconf_file = "$instdir/sles-suse/sysconfig_apache2";
+    if (($name eq 'sles') && ($version >= 12)) {
+       $sysconf_file = "$instdir/sles-suse/apache2.4/sysconfig_apache2";
+    }
+    copy $sysconf_file,"/etc/sysconfig/apache2";
     chmod(0444,"/etc/sysconfig/apache2");
 }
 
@@ -1748,7 +3673,7 @@ sub update_SuSEfirewall2_setup {
     } elsif (!-e  "/etc/insserv/overrides/SuSEfirewall2_setup.original") {
         copy "/etc/insserv/overrides/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup.original"
     }
-    copy "$instdir/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup";
+    copy "$instdir/sles-suse/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup";
     chmod(0444,"/etc/insserv/overrides/SuSEfirewall2_setup");
 }
 
@@ -1775,7 +3700,7 @@ sub get_iptables_rules {
     }
     my $ask_to_enable;
     if (-e "/etc/iptables.loncapa.rules") {
-        if (open(PIPE, "diff --brief $instdir/debian/iptables.loncapa.rules /etc/iptables.loncapa.rules |")) {
+        if (open(PIPE, "diff --brief $instdir/debian-ubuntu/iptables.loncapa.rules /etc/iptables.loncapa.rules |")) {
             my $diffres = <PIPE>;
             close(PIPE);
             chomp($diffres);
@@ -1786,14 +3711,14 @@ sub get_iptables_rules {
             print &mt('Error: unable to open [_1] to compare contents with LON-CAPA supplied file.','/etc/iptables.loncapa.rules')."\n";
         }
     } else {
-        if (-e "$instdir/debian/iptables.loncapa.rules") {
-            copy "$instdir/debian/iptables.loncapa.rules","/etc/iptables.loncapa.rules";
+        if (-e "$instdir/debian-ubuntu/iptables.loncapa.rules") {
+            copy "$instdir/debian-ubuntu/iptables.loncapa.rules","/etc/iptables.loncapa.rules";
             chmod(0600,"/etc/iptables.loncapa.rules");
         }
     }
     if (-e "/etc/iptables.loncapa.rules") {
         if (-e "/etc/network/if-pre-up.d/iptables") {
-            if (open(PIPE, "diff --brief $instdir/debian/iptables /etc/network/if-pre-up/iptables |")) {
+            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/iptables /etc/network/if-pre-up/iptables |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -1804,7 +3729,7 @@ sub get_iptables_rules {
                 print &mt('Error: unable to open [_1] to compare contents with LON-CAPA supplied file.','/etc/network/if-pre-up.d/iptables')."\n";
             }
         } else {
-            copy "$instdir/debian/iptables","/etc/network/if-pre-up.d/iptables";
+            copy "$instdir/debian-ubuntu/iptables","/etc/network/if-pre-up.d/iptables";
             chmod(0755,"/etc/network/if-pre-up.d/iptables");
             print_and_log(&mt('Installed script "[_1]" to add iptables rules to block all ports except 22, 80, and 443 when network is enabled during boot.','/etc/network/if-pre-up.d/iptables'));
             $ask_to_enable = 1;
@@ -1833,31 +3758,47 @@ sub download_loncapa {
 	print_and_log("
 ------------------------------------------------------------------------
 
-".&mt('You seem to have a version of loncapa-current.tar.gz in [_1]',$instdir)."\n".
+".&mt('You seem to have a version of [_1] in [_2]',$lctarball,$instdir)."\n".
 &mt('This copy will be used and a new version will NOT be downloaded.')."\n".
 &mt('If you wish, you may download a new version by executing:')."
 
-wget http://install.loncapa.org/versions/loncapa-current.tar.gz
+wget http://install.loncapa.org/versions/$lctarball
 
 ------------------------------------------------------------------------
 ");
     }
 
     ##
-    ## untar loncapa.tar.gz
+    ## untar loncapa-X.Y.Z.tar.gz
     ##
     if ($have_tarball) {
+        my $homedir = '/root';
+        my ($targetdir,$chdircmd,$updatecmd);
+        if (($distro =~ /^ubuntu/) && ($instdir ne $homedir)) {
+            ($homedir) = ($instdir =~ m{^(.*)/[^/]+$});
+            $updatecmd = 'sudo ./UPDATE';
+        } else {
+            $updatecmd = './UPDATE';
+        }
         print_and_log(&mt('Extracting LON-CAPA source files')."\n");
-        writelog(`cd ~root; tar zxf $instdir/$lctarball`);
+        if (-e $homedir) {
+            writelog(`tar zxf $instdir/$lctarball --directory $homedir`);
+            $targetdir = $homedir;
+        } else {
+            writelog(`tar zxf $instdir/$lctarball`);
+            $targetdir = $instdir;
+        }
+        if ($lctarball =~ /^loncapa\-(\d+\.\d+\.\d+(?:|[^.]+))\.tar\.gz$/) {
+            $chdircmd = "cd $targetdir/loncapa-".$1;
+        } else {
+            $chdircmd = "cd $targetdir/loncapa-X.Y.Z  (X.Y.Z should correspond to a version number like '2.11.3')";
+        }
         print_and_log("\n");
         print &mt('LON-CAPA source files extracted.')."\n".
-              &mt('It remains for you to execute the following commands:')."
-
-cd /root/loncapa-N.N     (N.N should correspond to a version number like '0.4')
-./UPDATE
-
-".&mt('If you have any trouble, please see [_1] and [_2]',
-      'http://install.loncapa.org/','http://help.loncapa.org/')."\n";
+              &mt('It remains for you to execute the following commands:').
+              "\n$chdircmd\n$updatecmd\n".
+              &mt('If you have any trouble, please see [_1] and [_2]',
+                  'http://install.loncapa.org/','http://help.loncapa.org/')."\n";
         $updateshown = 1;
     }
     return ($have_tarball,$updateshown);