--- doc/install/linux/install.pl	2019/02/16 16:19:11	1.45.2.1
+++ doc/install/linux/install.pl	2020/05/03 00:48:28	1.45.2.7
@@ -75,7 +75,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.45.2.1 2019/02/16 16:19:11 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.45.2.7 2020/05/03 00:48:28 raeburn Exp $'."\n";
 }
 
 #
@@ -164,7 +164,18 @@ sub get_user_selection {
 sub get_distro {
     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);
@@ -194,6 +205,10 @@ sub get_distro {
             $distro = 'rhes'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
+        } 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) release (\d+)/) {
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
@@ -306,7 +321,7 @@ sub get_distro {
                 $unknown = 1;
             }
         } else {
-            print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora or scientific linux system.')."\n";
+            print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora, scientific linux, or oracle linux system.')."\n";
         }
     }
     return ($distro,$packagecmd,$updatecmd,$installnow);
@@ -342,23 +357,26 @@ sub check_prerequisites {
 
 sub check_locale {
     my ($distro) = @_;
-    my ($fh,$langvar,$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';
         }
@@ -367,27 +385,33 @@ sub check_locale {
             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)(\d+)/) {
+    } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle)(\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) {
@@ -401,9 +425,13 @@ sub check_locale {
                     $command = 'sudo locale-gen en_US.UTF-8'."\n".
                                'sudo update-locale LANG=en_US.UTF-8';
                 } elsif ($distro =~ /^(suse|sles)/) {
-                    $command = 'yast language'; 
-                } else {
+                    $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;
@@ -499,7 +527,7 @@ sub check_mysql_running {
         if ($1 >= 19) {
             $mysqldaemon ='mariadb';
         }
-    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
             $mysqldaemon ='mariadb';
             $process = 'mysqld';
@@ -626,6 +654,9 @@ sub chkconfig {
         if (($distro =~ /^ubuntu/) && ($version <= 8)) {
             $daemon{'cups'} = 'cupsys';
         }
+        if (($distro =~ /^ubuntu/) && ($version >= 18)) {
+            $daemon{'ntp'}    = 'chrony';
+        }
     } elsif ($distro =~ /^fedora(\d+)/) {
         my $version = $1;
         if ($version >= 15) {
@@ -640,7 +671,10 @@ sub chkconfig {
         if ($version >= 19) {
             $daemon{'mysql'} = 'mariadb';
         }
-    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+        if ($version >= 26) {
+            $daemon{'ntp'} = 'chronyd';
+        }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         my $version = $1;
         if ($version >= 7) {
             $uses_systemctl{'ntp'} = 1;
@@ -650,6 +684,9 @@ sub chkconfig {
             $uses_systemctl{'cups'} = 1;
             $daemon{'mysql'} = 'mariadb';
         }
+        if (($version >= 8) || ($distro eq 'oracle7')) {
+            $daemon{'ntp'} = 'chronyd';
+        }
     }
     my $nocheck;
     if (! -x $checker_bin) {
@@ -744,7 +781,7 @@ sub chkconfig {
 
 sub uses_firewalld {
     my ($distro) = @_;
-    my ($inuse, $checkfirewalld);
+    my ($inuse,$checkfirewalld,$zone);
     if ($distro =~ /^(suse|sles)([\d\.]+)$/) {
         if (($1 eq 'sles') && ($2 >= 15)) {
             $checkfirewalld = 1;
@@ -753,7 +790,7 @@ sub uses_firewalld {
         if ($1 >= 18) {
             $checkfirewalld = 1;
         }
-    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+    } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
             $checkfirewalld = 1;
         }
@@ -774,9 +811,18 @@ sub uses_firewalld {
         }
         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 $inuse;
+    return ($inuse,$zone);
 }
 
 sub chkfirewall {
@@ -787,19 +833,20 @@ sub chkfirewall {
                     https => 443,
                 );
     my %activefw;
-    if (&firewall_is_active()) {
-        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 ($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";
@@ -821,9 +868,9 @@ sub chkfirewall {
                     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);
 }
@@ -882,6 +929,20 @@ sub chkapache {
                 }
             }
         }
+        if ((!$fixapache) && ($distname eq 'ubuntu')) {
+            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';
@@ -921,7 +982,8 @@ sub chkapache {
         }
     } else {
         my $configfile = 'httpd.conf';
-        if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+        my $mpmfile = 'mpm.conf';
+        if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
             if ($1 >= 7) {
                 $configfile = 'apache2.4/httpd.conf';
             } elsif ($1 > 5) {
@@ -929,7 +991,7 @@ sub chkapache {
             }
         } elsif ($distro =~ /^fedora(\d+)$/) {
             if ($1 > 17) {
-                $configfile = 'apache2.4/httpd.conf'; 
+                $configfile = 'apache2.4/httpd.conf';
             } elsif ($1 > 10) {
                 $configfile = 'new/httpd.conf';
             }
@@ -947,6 +1009,20 @@ sub chkapache {
                 }
             }
         }
+        if (-e "/etc/httpd/conf.modules.d/00-mpm.conf") {
+            if (!-e "$instdir/centos-rhes-fedora-sl/$mpmfile") {
+                print &mt('Warning: No LON-CAPA Apache MPM configuration file found for installation check.')."\n";
+            } elsif ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") && (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) {
+                if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/$mpmfile /etc/httpd/conf.modules.d/00-mpm.conf |")) {
+                    my $diffres = <PIPE>;
+                    close(PIPE);
+                    chomp($diffres);
+                    if ($diffres) {
+                        $fixapache = 1;
+                    }
+                }
+            }
+        }
     }
     return $fixapache;
 }
@@ -1407,7 +1483,7 @@ 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;
 }
@@ -1575,6 +1651,7 @@ if ($callsub{'apache'}) {
         &copy_apache2_debconf($instdir,$distro);
     } else {
         &copy_httpd_conf($instdir,$distro);
+        &copy_mpm_conf($instdir,$distro);
     }
 } else {
     print_and_log(&mt('Skipping configuration of Apache web server.')."\n");
@@ -1608,9 +1685,10 @@ if ($callsub{'runlevels'}) {
 }
 
 if ($callsub{'firewall'}) {
-    if (&uses_firewalld($distro)) {
+    my ($firewalld,$zone) = &uses_firewalld($distro);
+    if ($firewalld) {
         my (%current,%added);
-        if (open(PIPE,'firewall-cmd --permanent --zone=public --list-services |')) {
+        if (open(PIPE,"firewall-cmd --permanent --zone=$zone --list-services |")) {
             my $svc = <PIPE>;
             close(PIPE);
             chomp($svc);
@@ -1618,7 +1696,7 @@ if ($callsub{'firewall'}) {
         }
         foreach my $service ('http','https') {
             unless ($current{$service}) {
-                if (open(PIPE,"firewall-cmd --permanent --zone=public --add-service=$service |")) {
+                if (open(PIPE,"firewall-cmd --permanent --zone=$zone --add-service=$service |")) {
                     my $result = <PIPE>;
                     if ($result =~ /^success/) {
                         $added{$service} = 1;
@@ -1636,7 +1714,7 @@ if ($callsub{'firewall'}) {
         }
         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";
+                  "firewall-cmd --permanent --zone=$zone --add-service=ssh")."\n";
         }
     } elsif ($distro =~ /^(suse|sles)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
@@ -1658,14 +1736,24 @@ if ($callsub{'firewall'}) {
                 }
             }
         }
-    } elsif ($distro =~ /^scientific/) {
+    } elsif ($distro =~ /^(scientific|oracle)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
                   'system-config-firewall-tui -- Customize',
                   'ssh, http')."\n";
     } else {
-        print &mt('Use [_1] to configure the firewall to allow access for [_2].',
-                  'setup -- Firewall configuration -> Customize',
-                  'ssh, http, https')."\n";
+        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");
@@ -1953,8 +2041,9 @@ CREATE TABLE IF NOT EXISTS metadata (tit
 sub setup_mysql_permissions {
     my ($dbh,$has_pass,@mysql_lc_commands) = @_;
     my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
-    my ($usesauth,$hasauthcol,@mysql_commands);
+    my ($usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
     if ($mysqlname =~ /^MariaDB/i) {
+        $is_mariadb = 1;
         if ($mysqlversion >= 10.2) {
             $usesauth = 1;
         } elsif ($mysqlversion >= 5.5) {
@@ -1968,8 +2057,12 @@ sub setup_mysql_permissions {
         }
     }
     if ($usesauth) {
-        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')",
-                         "ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
+        @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 {
@@ -2024,7 +2117,7 @@ INSERT db (Host,Db,User,Select_priv,Inse
             }
         }
         if ($got_passwd) {
-            my (@newpass_cmds) = &new_mysql_rootpasswd($newmysqlpass,$usesauth);
+            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");
@@ -2054,10 +2147,15 @@ INSERT db (Host,Db,User,Select_priv,Inse
 }
 
 sub new_mysql_rootpasswd {
-    my ($currmysqlpass,$usesauth) = @_;
+    my ($currmysqlpass,$usesauth,$is_mariadb) = @_;
     if ($usesauth) {
-        return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",
-                "FLUSH PRIVILEGES;");
+        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;");
@@ -2070,7 +2168,7 @@ sub get_mysql_version {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)\-?(\w*),/);
+        ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)(?:\-?(\w*),|)/);
     } else {
         print &mt('Could not determine which version of MySQL is installed.').
               "\n";
@@ -2088,7 +2186,7 @@ sub get_mysql_version {
 sub copy_httpd_conf {
     my ($instdir,$distro) = @_;
     my $configfile = 'httpd.conf';
-    if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+    if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
         if ($1 >= 7) {
             $configfile = 'apache2.4/httpd.conf';
         } elsif ($1 > 5) {
@@ -2109,6 +2207,50 @@ sub copy_httpd_conf {
     print_and_log("\n");
 }
 
+###########################################################
+##
+## RHEL/CentOS/Fedora/Scientific Linux
+## Copy LON-CAPA mpm.conf to /etc/httpd/conf.modules.d/00-mpm.conf
+##
+## The LON-CAPA mpm.conf enables the prefork MPM module in
+## Apache. This is also the default for RHEL/CentOS/Oracle
+## Linux 7 and earlier, and Fedora 26 and earlier. For more
+## recent versions of those distros, the event MPM is enabled
+## by default. After &copy_mpm_conf() is run, the prefork MPM
+## module will be enabled instead of the event MPM module.
+##
+###########################################################
+
+sub copy_mpm_conf {
+    my ($instdir,$distro) = @_;
+    my $mpmfile = 'mpm.conf';
+    if ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") &&
+        (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) {
+        print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'mpm.conf'",
+                      "'/etc/httpd/conf.modules.d/00-mpm.conf'")."\n");
+        copy "$instdir/centos-rhes-fedora-sl/$mpmfile","/etc/httpd/conf.modules.d/00-mpm.conf";
+        chmod(0644,"/etc/httpd/conf.modules.d/00-mpm.conf");
+        print_and_log("\n");
+    } else {
+        my $logfail;
+        if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
+            if ($1 > 7) {
+                $logfail = 1;
+            }
+        } elsif ($distro =~ /^fedora(\d+)$/) {
+            if ($1 > 26) {
+                $logfail = 1;
+            }
+        }
+        if ($logfail) {
+            print_and_log(&mt('Warning: copying the LON-CAPA [_1] failed because [_2] and/or [_3] are missing.',
+                              $mpmfile,"'$instdir/centos-rhes-fedora-sl/$mpmfile'",
+                              "'/etc/httpd/conf.modules.d/00-mpm.conf'"));
+            print_and_log("\n");
+        }
+    }
+}
+
 #########################################################
 ##
 ## Ubuntu/Debian -- copy our loncapa configuration file to
@@ -2137,35 +2279,116 @@ sub copy_apache2_debconf {
     if (($distname eq 'ubuntu') && ($version > 12)) {
         $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
     }
-    if (-l $defaultconfig) {
-        unlink($defaultconfig);
-    }
+    my ($skipconf,$skipsite,$skipstatus);
     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");
+        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.original");
+                }
+                if (-l $defaultconf) {
+                    my $linkfname = readlink($defaultconf);
+                    if ($linkfname eq "$apache2_conf_available_dir/loncapa") {
+                        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");
+            chmod(0444,"$apache2_conf_available_dir/loncapa");
+            if (-l $defaultconf) {
+                unlink($defaultconf);
+            }
+            symlink("$apache2_conf_available_dir/loncapa","$defaultconf");
+        }
+        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.original");
+                }
+                if (-l $defaultconfig) {
+                    my $linkfname = readlink($defaultconfig);
+                    if ($linkfname eq "$apache2_sites_available_dir/loncapa") {
+                        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'","'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 {
+        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') {
+        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");
 }
@@ -2365,7 +2588,7 @@ wget http://install.loncapa.org/versions
         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')
+cd /root/loncapa-X.Y.Z     (X.Y.Z should correspond to a version number like '2.11.3')
 ./UPDATE
 
 ".&mt('If you have any trouble, please see [_1] and [_2]',