--- doc/install/linux/install.pl	2011/05/05 16:38:07	1.11
+++ doc/install/linux/install.pl	2019/02/19 19:24:28	1.45.2.2
@@ -27,6 +27,9 @@ use strict;
 use File::Copy;
 use Term::ReadKey;
 use DBI;
+use Cwd();
+use File::Basename();
+use lib File::Basename::dirname(Cwd::abs_path($0));
 use LCLocalization::localize;
 
 # ========================================================= The language handle
@@ -72,7 +75,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.11 2011/05/05 16:38:07 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.45.2.2 2019/02/19 19:24:28 raeburn Exp $'."\n";
 }
 
 #
@@ -159,7 +162,7 @@ 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') {
         open(IN,'</etc/redhat-release');
@@ -191,11 +194,11 @@ sub get_distro {
             $distro = 'rhes'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /CentOS release (\d+)/) {
+        } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
             $distro = 'centos'.$1;
             $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;
@@ -204,6 +207,7 @@ sub get_distro {
         } 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 +223,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 +234,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 +254,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,9 +276,38 @@ 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 or scientific 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);
 }
@@ -314,12 +349,39 @@ sub check_locale {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/default/locale');
         }
-    } elsif ($distro =~ /^(suse|sles)/) {
-        if (!open($fh,"</etc/sysconfig/language")) {
+    } 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');
+            }
+        } else {
+            if (!open($fh,"</etc/sysconfig/language")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/sysconfig/language');
+            }
+            $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');
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
-                      '/etc/sysconfig/language');
+                      '/etc/sysconfig/i18n');
+        }
+    } elsif ($distro =~ /^(?:rhes|centos|scientific)(\d+)/) {
+        if ($1 >= 7) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/i18n');
         }
-        $langvar = 'RC_LANG';
     } else {
         if (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
@@ -329,13 +391,15 @@ sub check_locale {
     my @data = <$fh>;
     chomp(@data);
     foreach my $item (@data) {
-        if ($item =~ /^\Q$langvar\E=\"([^\"]*)\"/) {
+        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'; 
+                    $command = 'sudo locale-gen en_US.UTF-8'."\n".
+                               'sudo update-locale LANG=en_US.UTF-8';
                 } elsif ($distro =~ /^(suse|sles)/) {
                     $command = 'yast language'; 
                 } else {
@@ -357,14 +421,14 @@ 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,$has_lcdb,%recommended,
+        $downloadstatus,$filetouse,$production,$testing,$apachefw,$tostop,$uses_systemctl);
     my $wwwuid = &uid_of_www();
     my $wwwgid = getgrnam('www');
     if (($wwwuid eq '') || ($wwwgid eq '')) {
@@ -376,35 +440,45 @@ sub check_required {
     $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) = 
+            &check_mysql_setup($instdir,$dsn,$distro,$mysql_has_wwwuser);
+        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;
         }
     }
     ($recommended{'firewall'},$apachefw) = &chkfirewall($distro);
-    ($recommended{'runlevels'},$tostop) = &chkconfig($distro,$instdir);
+    ($recommended{'runlevels'},$tostop,$uses_systemctl) = &chkconfig($distro,$instdir);
     $recommended{'apache'} = &chkapache($distro,$instdir);
     $recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
     ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing) 
         = &need_download();
     return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-            \%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
-            $filetouse,$production,$testing,$apachefw);
+            $mysqlrestart,\%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
+            $filetouse,$production,$testing,$apachefw,$uses_systemctl);
 }
 
 sub check_mysql_running {
     my ($distro) = @_;
+    my $use_systemctl;
     my $mysqldaemon ='mysqld';
     if ($distro =~ /^(suse|sles|debian|ubuntu)/) {
         $mysqldaemon = 'mysql';
@@ -416,8 +490,37 @@ sub check_mysql_running {
             $process = 'mysqld';
             $proc_owner = 'mysql';
         }
+    } elsif ($distro =~ /^fedora(\d+)/) {
+        if ($1 >= 16) {
+            $process = 'mysqld';
+            $proc_owner = 'mysql';
+            $use_systemctl = 1;
+        }
+        if ($1 >= 19) {
+            $mysqldaemon ='mariadb';
+        }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+        if ($1 >= 7) {
+            $mysqldaemon ='mariadb';
+            $process = 'mysqld';
+            $proc_owner = 'mysql';
+            $use_systemctl = 1;
+        }
+    } 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);
@@ -425,21 +528,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 {
@@ -450,8 +567,9 @@ sub check_mysql_running {
 
 sub chkconfig {
     my ($distro,$instdir) = @_;
-    my (%needfix,%tostop);
+    my (%needfix,%tostop,%uses_systemctl);
     my $checker_bin = '/sbin/chkconfig';
+    my $sysctl_bin = '/bin/systemctl';
     my %daemon = (
                   mysql     => 'mysqld',
                   apache    => 'httpd',
@@ -470,66 +588,140 @@ sub chkconfig {
         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';
         }
+    } 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';
+        }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\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';
+        }
     }
+    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.' 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 ($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\.]+)$/) {
@@ -541,13 +733,50 @@ sub chkconfig {
         } else {
             $major = $version;
         }
-        if ($major > 10) {
+        if (($major > 10) && ($major <= 13)) {
             if (&check_SuSEfirewall2_setup($instdir)) {
                 $needfix{'insserv'} = 1;
             }
         }
     }
-    return (\%needfix,\%tostop);
+    return (\%needfix,\%tostop,\%uses_systemctl);
+}
+
+sub uses_firewalld {
+    my ($distro) = @_;
+    my ($inuse, $checkfirewalld);
+    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)(\d+)/) {
+        if ($1 >= 7) {
+            $checkfirewalld = 1;
+        }
+    }
+    if ($checkfirewalld) {
+        my ($loaded,$active);
+        if (open(PIPE,"systemctl status firewalld |")) {
+            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;
+        }
+    }
+    return $inuse;
 }
 
 sub chkfirewall {
@@ -559,25 +788,38 @@ sub chkfirewall {
                 );
     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";
+        if (&uses_firewalld($distro)) {
+            my %current;
+            if (open(PIPE,'firewall-cmd --permanent --zone=public --list-services |')) {
+                my $svc = <PIPE>;
+                close(PIPE);
+                chomp($svc);
+                map { $current{$_} = 1; } (split(/\s+/,$svc));
+            }
+            if ($current{'http'} && $current{'https'}) {
+                $configfirewall = 0;
+            }
         } 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 $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 {
@@ -589,17 +831,47 @@ sub chkfirewall {
 sub chkapache {
     my ($distro,$instdir) = @_;
     my $fixapache = 1;
-    if ($distro =~ /^(debian|ubuntu)/) {
-        if (!-e "$instdir/debian-ubuntu/apache2.conf") {
+    if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+        my $distname = $1;
+        my $version = $2;
+        my ($stdconf,$stdsite);
+        if (($distname eq 'ubuntu') && ($version > 12)) {
+            $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/debian-ubuntu/apache2.conf")) {
-            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/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)) {
+                $sitefile = '/etc/apache2/sites-available/loncapa';
+                $configfile = "/etc/apache2/conf-available/loncapa";
+            } 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)) {
+                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;
+                        }
+                    }
                 }
             }
         }
@@ -610,16 +882,21 @@ sub chkapache {
                 }
             }
         }
-    } elsif ($distro =~ /^(?:suse|sles)([\d\.]+)$/) {
+    } elsif ($distro =~ /^(suse|sles)([\d\.]+)$/) {
+        my ($name,$version) = ($1,$2);
         my $apache = 'apache';
-        if ($1 >= 10) {
+        my $conf_file = "$instdir/sles-suse/default-server.conf";
+        if ($version >= 10) {
             $apache = 'apache2';
         }
-        if (!-e "$instdir/sles-suse/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/sles-suse/default-server.conf")) {
-            if (open(PIPE, "diff --brief $instdir/sles-suse/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);
@@ -643,11 +920,25 @@ sub chkapache {
             }
         }
     } else {
-        if (!-e "$instdir/centos-rhes-fedora-sl/httpd.conf") {
+        my $configfile = 'httpd.conf';
+        if ($distro =~ /^(?:centos|rhes|scientific)(\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/centos-rhes-fedora-sl/httpd.conf")) {
-            if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/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);
@@ -678,8 +969,12 @@ sub chksrvcs {
             chomp($daemonrunning);
             close(PIPE);
             if ($daemonrunning) {
-                if ($service eq 'memcached') { 
-                    unless ($daemonrunning =~ m{^www[^/]+\Q/usr/sbin/memcached -m 400 -v\E$}) {
+                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 {
@@ -781,13 +1076,36 @@ sub need_download {
 }
 
 sub check_mysql_setup {
-    my ($instdir,$dsn) = @_;
+    my ($instdir,$dsn,$distro,$mysql_has_wwwuser) = @_;
     my ($mysqlsetup,$has_pass);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
     if ($dbh) {
         $mysqlsetup = 'noroot'; 
     } 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);
+            }
+            unless ($mysql_has_wwwuser) {
+                $mysql_has_wwwuser = &check_mysql_wwwuser();
+            }
+            $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
+            if ($dbh) {
+                $mysqlsetup = 'noroot';
+            } elsif ($DBI::err =~ /1045/) {
+                $has_pass = 1;
+            } else {
+                $mysqlsetup = 'needsrestart';
+                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";
@@ -814,16 +1132,17 @@ sub check_mysql_setup {
                 }
             }
         }
-     } elsif ($mysqlsetup ne 'noroot') {
+    } elsif ($mysqlsetup ne 'noroot') {
         print_and_log(&mt('Problem accessing MySQL.')."\n");
         $mysqlsetup = 'rootfail';
     }
-    return ($mysqlsetup,$has_pass,$dbh);
+    return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser);
 }
 
 sub check_mysql_wwwuser {
     my $mysql_wwwuser;
-    my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey');
+    my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
+                            {PrintError => +0}) || return;
     if ($dbhn) {
         $mysql_wwwuser = 1;
         $dbhn->disconnect;
@@ -862,10 +1181,16 @@ sub get_pathto_iptables {
 
 sub firewall_is_active {
     if (-e '/proc/net/ip_tables_names') {
-        return 1;
-    } else {
-        return 0;
+        if (open(PIPE,'cat /proc/net/ip_tables_names |grep filter |')) {
+            my $status = <PIPE>;
+            close(PIPE);
+            chomp($status);
+            if ($status eq 'filter') {
+                return 1;
+            }
+        }
     }
+    return 0;
 }
 
 sub get_fw_chains {
@@ -881,6 +1206,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') {
@@ -1073,9 +1400,9 @@ my %prompts = &texthash(
 print "\n".&mt('Checking system status ...')."\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,$has_lcdb,$downloadstatus,$filetouse,$production,
+    $testing,$apachefw,$uses_systemctl) = &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].',
@@ -1084,6 +1411,13 @@ if ($distro eq '') {
           &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".
@@ -1092,7 +1426,7 @@ 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 '') {
@@ -1106,17 +1440,17 @@ 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) = 
+                     $mysqlrestart,$recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
+                     $filetouse,$production,$testing,$apachefw,$uses_systemctl) = 
                      &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 {
@@ -1186,7 +1520,7 @@ if ($callsub{'download'}) {
         print &mt('The most recent LON-CAPA release is version: [_1].',$production)."\n".
               &mt('Download the production release? ~[Y/n~]');
         if (&get_user_selection(1)) {
-            $sourcetarball = $production.'tar.gz';
+            $sourcetarball = 'loncapa-'.$production.'.tar.gz';
         }
     }
 } elsif ($filetouse ne '') {
@@ -1236,11 +1570,11 @@ if ($dbh) {
 
 if ($callsub{'apache'}) {
     if ($distro =~ /^(suse|sles)/) {
-        &copy_apache2_suseconf($instdir);
+        &copy_apache2_suseconf($instdir,$distro);
     } elsif ($distro =~ /^(debian|ubuntu)/) {
-        &copy_apache2_debconf($instdir);
+        &copy_apache2_debconf($instdir,$distro);
     } else {
-        &copy_httpd_conf($instdir);
+        &copy_httpd_conf($instdir,$distro);
     }
 } else {
     print_and_log(&mt('Skipping configuration of Apache web server.')."\n");
@@ -1264,18 +1598,50 @@ if ($callsub{'runlevels'}) {
             }  
         }
     }
-    if ($distro =~ /^(suse|sles)/) {
-        &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)/) {
+    if (&uses_firewalld($distro)) {
+        my (%current,%added);
+        if (open(PIPE,'firewall-cmd --permanent --zone=public --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=public --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";
+        }
+        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 the like to allow access to ssh from outside, use the command[_1].',
+                  'firewall-cmd --permanent --zone=public --add-service=ssh')."\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].',
@@ -1306,7 +1672,7 @@ if ($callsub{'firewall'}) {
 }
 
 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] daemons).',"'cups','memcached'")."\n");
 }
@@ -1461,7 +1827,7 @@ ENDPATCH
         ## 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
@@ -1493,7 +1859,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) {
@@ -1510,16 +1876,45 @@ sub kill_extra_services {
                             if (($distro =~ /^ubuntu/) && ($version <= 8)) {
                                 $daemon = 'cupsys';
                             }
-                        } elsif ($distro =~ /^(?:suse|sles|scientific)/) {
+                        } else {
                             $daemon = 'cups';
                         }
                     }
-	            &print_and_log(`/etc/init.d/$daemon stop`);
+                    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(&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)) {
+                            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`);
+                        } 
                     }
                 }
             }
@@ -1536,7 +1931,7 @@ sub setup_mysql {
     }
     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);
@@ -1557,8 +1952,34 @@ 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 ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
+    if ($mysqlname =~ /^MariaDB/i) {
+        $is_mariadb = 1;
+        if ($mysqlversion >= 10.2) {
+            $usesauth = 1;
+        } elsif ($mysqlversion >= 5.5) {
+            $hasauthcol = 1;
+        }
+    } else {
+        if (($mysqlversion > 5.7) || (($mysqlversion == 5.7) && ($mysqlsubver > 5))) {
+            $usesauth = 1;
+        } elsif (($mysqlversion >= 5.6) || (($mysqlversion == 5.5) && ($mysqlsubver >= 7))) {
+            $hasauthcol = 1;
+        }
+    }
+    if ($usesauth) {
+        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')");
+        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')");
@@ -1608,7 +2029,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");
@@ -1617,7 +2038,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) {
@@ -1639,23 +2059,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,$subversion,$name);
     if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version) = ($info =~ /(\d+\.\d+)\.\d+,/);  
+        ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)\-?(\w*),/);
     } else {
         print &mt('Could not determine which version of MySQL is installed.').
               "\n";
     }
-    return $version;
+    return ($version,$subversion,$name);
 }
 
 ###########################################################
@@ -1666,36 +2096,38 @@ sub get_mysql_version {
 ###########################################################
 
 sub copy_httpd_conf {
-    my ($instdir) = @_;
+    my ($instdir,$distro) = @_;
+    my $configfile = 'httpd.conf';
+    if ($distro =~ /^(?:centos|rhes|scientific)(\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/centos-rhes-fedora-sl/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");
 }
 
 #########################################################
 ##
-## 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/debian-ubuntu/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) = @_;
     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') {
@@ -1704,6 +2136,47 @@ 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 ($distname,$version);
+    if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+        $distname = $1;
+        $version = $2;
+    }
+    if (($distname eq 'ubuntu') && ($version > 12)) {
+        $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
+    }
+    if (-l $defaultconfig) {
+        unlink($defaultconfig);
+    }
+    if (($distname eq 'ubuntu') && ($version > 12)) {
+        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");
+        my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';
+        my $apache2_conf_available_dir = '/etc/apache2/conf-available';
+        if (-e "$apache2_conf_available_dir/loncapa") {
+            copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
+        }
+        my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
+        copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa");
+        chmod(0444,"$apache2_conf_available_dir/loncapa");
+        if (-l $defaultconf) {
+            unlink($defaultconf);
+        }
+        symlink("$apache2_conf_available_dir/loncapa","$defaultconf");
+        print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default.conf symlink'")."\n");
+        copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa");
+        chmod(0444,"$apache2_sites_available_dir/loncapa");
+        symlink("$apache2_sites_available_dir/loncapa","$defaultconfig");
+    } else {
+        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 "$apache2_sites_available_dir/loncapa") {
+            copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
+        }
+        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");
+    }
     print_and_log("\n");
 }
 
@@ -1716,14 +2189,19 @@ sub copy_apache2_debconf {
 ###########################################################
 
 sub copy_apache2_suseconf {
-    my ($instdir) = @_;
+    my ($instdir,$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/sles-suse/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 '');
@@ -1734,7 +2212,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");
 }
 
@@ -1760,12 +2238,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/sles-suse/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");
 }