doc/install/linux/install.pl - diff

Return to install.pl CVS log

Up to [LON-CAPA] / doc / install / linux

Diff for /doc/install/linux/install.pl between versions 1.45.2.18 and 1.55

-version 1.45.2.18, 2021/12/21 16:07:53
+version 1.55, 2019/07/02 19:40:35
  Line 26
  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));
- Line 210  sub get_distro {
+ Line 211  sub get_distro {
              $distro = 'rhes'.$1;
              $updatecmd = 'dnf install LONCAPA-prerequisites';
              $installnow = 'dnf -y install LONCAPA-prerequisites';
-         } elsif ($versionstring =~ /CentOS(| Linux| Stream) release (\d+)/) {
+         } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
-             $distro = 'centos'.$2;
+             $distro = 'centos'.$1;
-             if ($1 eq ' Stream') {
-                 $distro .= '-stream';
-             }
              $updatecmd = 'yum install LONCAPA-prerequisites';
              $installnow = 'yum -y install LONCAPA-prerequisites';
          } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
- Line 223  sub get_distro {
+ Line 221  sub get_distro {
              $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";
- Line 343  sub get_distro {
+ Line 329  sub get_distro {
      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_hostname() 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;
- Line 373  sub check_prerequisites {
+ Line 421  sub check_prerequisites {
  sub check_locale {
      my ($distro) = @_;
-     my ($fh,$langvar,$command,$earlyout);
+     my ($fh,$langvar,$command);
      $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';
          }
- Line 401  sub check_locale {
+ Line 446  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|oracle|rocky|alma)(\d+)/) {
+     } 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');
-                 $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) {
- Line 441  sub check_locale {
+ Line 480  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';
                  } 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';
+                     $command = 'localectl set-locale en_US.UTF-8';
                  } else {
                      $command = 'No standard command found';
                  }
- Line 471  sub check_required {
+ Line 510  sub check_required {
      unless ($localecmd eq '') {
          return ($distro,$gotprereqs,$localecmd);
      }
-     my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,
+     my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$has_lcdb,%recommended,
-         %recommended,$downloadstatus,$filetouse,$production,$testing,$apachefw,
+         $downloadstatus,$filetouse,$production,$testing,$apachefw,$tostop,
-         $tostop,$uses_systemctl,$mysql_has_wwwuser);
+         $uses_systemctl,$hostname,$hostip);
      my $wwwuid = &uid_of_www();
      my $wwwgid = getgrnam('www');
      if (($wwwuid eq '') || ($wwwgid eq '')) {
- Line 482  sub check_required {
+ Line 521  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) {
-         ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) =
+         my $mysql_has_wwwuser = &check_mysql_wwwuser();
-             &check_mysql_setup($instdir,$dsn,$distro);
+         ($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') {
- Line 509  sub check_required {
+ Line 568  sub check_required {
              }
          }
      }
+     my ($sslhostsfilesref,$has_std,$has_int,$rewritenum,$nochgstd,$nochgint);
      ($recommended{'firewall'},$apachefw) = &chkfirewall($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($distro,$instdir);
+         = &need_download();
      return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-             $mysqlrestart,\%recommended,$dbh,$has_pass,$mysql_unix_socket,
+             $mysqlrestart,\%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
-             $has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
+             $filetouse,$production,$testing,$apachefw,$uses_systemctl,$hostname,
-             $uses_systemctl);
+             $hostip,$sslhostsfilesref,$has_std,$has_int,$rewritenum,$nochgstd,
+             $nochgint);
  }
  sub check_mysql_running {
- Line 544  sub check_mysql_running {
+ Line 607  sub check_mysql_running {
          if ($1 >= 19) {
              $mysqldaemon ='mariadb';
          }
-         if ($1 >= 34) {
+     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
-             $process = 'mariadb';
-         }
-     } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
          if ($1 >= 7) {
              $mysqldaemon ='mariadb';
              $process = 'mysqld';
- Line 674  sub chkconfig {
+ Line 734  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) {
- Line 691  sub chkconfig {
+ Line 748  sub chkconfig {
          if ($version >= 19) {
              $daemon{'mysql'} = 'mariadb';
          }
-         if ($version >= 26) {
+     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
-             $daemon{'ntp'} = 'chronyd';
-         }
-     } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
          my $version = $1;
          if ($version >= 7) {
              $uses_systemctl{'ntp'} = 1;
- Line 704  sub chkconfig {
+ Line 758  sub chkconfig {
              $uses_systemctl{'cups'} = 1;
              $daemon{'mysql'} = 'mariadb';
          }
-         if (($version >= 8) || ($distro eq 'oracle7')) {
+         if ($version >= 8) {
              $daemon{'ntp'} = 'chronyd';
          }
      }
- Line 810  sub uses_firewalld {
+ Line 864  sub uses_firewalld {
          if ($1 >= 18) {
              $checkfirewalld = 1;
          }
-     } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
          if ($1 >= 7) {
              $checkfirewalld = 1;
          }
      }
      if ($checkfirewalld) {
          my ($loaded,$active);
-         if (open(PIPE,"systemctl status firewalld 2>/dev/null |")) {
+         if (open(PIPE,"systemctl status firewalld |")) {
              while (<PIPE>) {
                  chomp();
                  if (/^\s*Loaded:\s+(\w+)/) {
                      $loaded = $1;
                  }
-                 if (/^\s*Active:\s+(\w+)/) {
+                 if (/^\s*Active\s+(\w+)/) {
                      $active = $1;
                  }
              }
- Line 914  sub chkapache {
+ Line 968  sub chkapache {
          } else {
              my ($configfile,$sitefile);
              if (($distname eq 'ubuntu') && ($version > 12)) {
-                 $sitefile = '/etc/apache2/sites-available/loncapa.conf';
+                 $sitefile = '/etc/apache2/sites-available/loncapa';
-                 $configfile = '/etc/apache2/conf-available/loncapa.conf';
+                 $configfile = "/etc/apache2/conf-available/loncapa";
              } else {
-                 $configfile = '/etc/apache2/sites-available/loncapa';
+                 $configfile = "/etc/apache2/sites-available/loncapa";
              }
              if (($configfile ne '') && (-e $configfile) && (-e $stdconf))  {
                  if (open(PIPE, "diff --brief $stdconf $configfile |")) {
- Line 949  sub chkapache {
+ Line 1003  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';
          my $conf_file = "$instdir/sles-suse/default-server.conf";
          if ($version >= 10) {
              $apache = 'apache2';
          }
          if (($name eq 'sles') && ($version >= 12)) {
              $conf_file = "$instdir/sles-suse/apache2.4/default-server.conf";
          }
-         if (!-e $conf_file) {
+         if (!-e "$conf_file") {
              $fixapache = 0;
              print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
          } elsif (-e "/etc/$apache/default-server.conf") {
- Line 1002  sub chkapache {
+ Line 1042  sub chkapache {
          }
      } else {
          my $configfile = 'httpd.conf';
-         my $mpmfile = 'mpm.conf';
+         if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
-         if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
              if ($1 >= 7) {
                  $configfile = 'apache2.4/httpd.conf';
              } elsif ($1 > 5) {
- Line 1011  sub chkapache {
+ Line 1050  sub chkapache {
              }
          } elsif ($distro =~ /^fedora(\d+)$/) {
              if ($1 > 17) {
                  $configfile = 'apache2.4/httpd.conf';
              } elsif ($1 > 10) {
                  $configfile = 'new/httpd.conf';
              }
- Line 1029  sub chkapache {
+ Line 1068  sub chkapache {
                  }
              }
          }
-         if (-e "/etc/httpd/conf.modules.d/00-mpm.conf") {
+     }
-             if (!-e "$instdir/centos-rhes-fedora-sl/$mpmfile") {
+     return $fixapache;
-                 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>;
+ # chkapachessl() determines whether a server's Apache SSL configuration
-                     close(PIPE);
+ # needs updating to support LON-CAPA.
-                     chomp($diffres);
+ #
-                     if ($diffres) {
+ # LON-CAPA uses VirtualHosts for port 443, and requires that they are
-                         $fixapache = 1;
+ # 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")) {
+                                     print_and_log(&mt("Warning, use: 'sudo a2ensite $file' to activate LON-CAPA SSL Apache config\n"));
+                                 }
+                             }
+                         }
                      }
                  }
              }
          }
      }
-     return $fixapache;
+     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 {
- Line 1083  sub chksrvcs {
+ Line 1396  sub chksrvcs {
  }
  sub need_download {
-     my ($distro,$instdir) = @_;
      my $needs_download = 1;
      my ($production,$testing,$stdsizes) = &download_versionslist();
-     my ($localcurrent,$localtesting,%tarball,%localsize,%bymodtime,
+     my ($rootdir,$localcurrent,$localtesting,%tarball,%localsize,%bymodtime,
          %bysize,$filetouse,$downloadstatus);
-     if (opendir(my $dir,$instdir)) {
+     $rootdir = '/root';
+     if (opendir(my $dir,"$rootdir")) {
          my (@lcdownloads,$version);
          foreach my $file (readdir($dir)) {
              if ($file =~ /^loncapa\-([\w\-.]+)\.tar\.gz$/) {
- Line 1098  sub need_download {
+ Line 1411  sub need_download {
              }
              if (ref($stdsizes) eq 'HASH') {
                  if ($version eq 'current') {
-                     my @stats = stat("$instdir/$file");
+                     my @stats = stat("$rootdir/$file");
                      $localcurrent = $stats[7];
                      if ($localcurrent == $stdsizes->{$production}) {
                          $needs_download = 0;
                          $filetouse = $file;
                      }
                  } elsif ($version eq 'testing') {
-                     my @stats = stat("$instdir/$file");
+                     my @stats = stat("$rootdir/$file");
                      $localtesting = $stats[7];
                      if ($localtesting == $stdsizes->{$testing}) {
                          $needs_download = 0;
- Line 1119  sub need_download {
+ Line 1432  sub need_download {
          if ($needs_download) {
              if (@lcdownloads > 0) {
                  foreach my $version (@lcdownloads) {
-                     my @stats = stat("$instdir/$tarball{$version}");
+                     my @stats = stat("$rootdir/$tarball{$version}");
                      my $mtime = $stats[9];
                      $localsize{$version} = $stats[7];
                      if ($mtime) {
- Line 1152  sub need_download {
+ Line 1465  sub need_download {
                      my $newest = $sorted[0];
                      if (ref($bymodtime{$newest}) eq 'ARRAY') {
                          $downloadstatus =
-                               "Latest LON-CAPA source download in $instdir is: ".
+                               "Latest LON-CAPA source download in $rootdir is: ".
                                join(',',@{$bymodtime{$newest}})." (downloaded ".
                                localtime($newest).")\n";
                      }
                  } else {
                      $downloadstatus =
-                         "The $instdir directory already contains the latest LON-CAPA version:".
+                         "The $rootdir directory already contains the latest LON-CAPA version:".
                          "\n".$filetouse."\n"."which can be used for installation.\n";
                  }
              } else {
-                 $downloadstatus = "The $instdir directory does not appear to contain any downloaded LON-CAPA source code files which can be used for installation.\n";
+                 $downloadstatus = "The $rootdir 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 $instdir directory to look for existing downloads of LON-CAPA source code.\n";
+         $downloadstatus = "Could not open $rootdir 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,$distro) = @_;
+     my ($instdir,$dsn,$distro,$mysql_has_wwwuser) = @_;
-     my ($mysqlsetup,$has_pass,$mysql_unix_socket,$mysql_has_wwwuser);
+     my ($mysqlsetup,$has_pass);
      my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
-     my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
-     if (($mysqlname =~ /^MariaDB/i) && ($mysqlversion >= 10.4)) {
-         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';
-         if (($mysqlname !~ /^MariaDB/i) && ($mysqlversion >= 5.7)) {
-             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+)$/) {
- Line 1226  sub check_mysql_setup {
+ Line 1502  sub check_mysql_setup {
                  }
                  close(PIPE);
              }
+             unless ($mysql_has_wwwuser) {
+                 $mysql_has_wwwuser = &check_mysql_wwwuser();
+             }
              $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);
              }
          }
- Line 1246  sub check_mysql_setup {
+ Line 1523  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");
- Line 1258  sub check_mysql_setup {
+ Line 1534  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') {
          print_and_log(&mt('Problem accessing MySQL.')."\n");
          $mysqlsetup = 'rootfail';
-         $mysql_has_wwwuser = &check_mysql_wwwuser();
      }
      return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser);
  }
  sub check_mysql_wwwuser {
-     my ($dbh) = @_;
      my $mysql_wwwuser;
-     if ($dbh) {
+     my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
-         $mysql_wwwuser = $dbh->selectrow_array("SELECT COUNT(User) FROM mysql.user WHERE (User = 'www' AND Host ='localhost')");
+                             {PrintError => +0}) || return;
-     } else {
+     if ($dbhn) {
-         my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
+         $mysql_wwwuser = 1;
-                                 {PrintError => +0}) || return;
+         $dbhn->disconnect;
-         if ($dbhn) {
-             $mysql_wwwuser = 1;
-             $dbhn->disconnect;
-         }
      }
      return $mysql_wwwuser;
  }
- Line 1491  print "
+ Line 1759  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('6.')." ".&mt('Configure SSL for Apache web server.')."
- ".&mt('7.')." ".&mt('Check firewall settings.')."
+ ".&mt('7.')." ".&mt('Configure start-up of services.')."
- ".&mt('8.')." ".&mt('Stop services not used by LON-CAPA,')."
+ ".&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.')."
- Line 1525  chomp($instdir);
+ Line 1794  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,$mysqlrestart,
-     $recommended,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,$downloadstatus,
+     $recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,$filetouse,$production,
-     $filetouse,$production,$testing,$apachefw,$uses_systemctl) = &check_required($instdir,$dsn);
+     $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, '.
-               'Oracle Linux, openSuSE, SLES, Ubuntu LTS, Debian')."\n\n".
+               'openSuSE, SLES, Ubuntu LTS, Debian')."\n\n".
            &mt('Stopping execution.')."\n";
      exit;
  }
- Line 1571  if (!$gotprereqs) {
+ Line 1842  if (!$gotprereqs) {
            &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~]');
- Line 1586  if (!$gotprereqs) {
+ Line 1856  if (!$gotprereqs) {
                      exit;
                  } else {
                      ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-                      $mysqlrestart,$recommended,$dbh,$has_pass,$mysql_unix_socket,
+                      $mysqlrestart,$recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
-                      $has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
+                      $filetouse,$production,$testing,$apachefw,$uses_systemctl) =
-                      $uses_systemctl) = &check_required($instdir,$dsn);
+                      &check_required($instdir,$dsn);
                  }
              } else {
                  print &mt('Failed to run command to install LONCAPA-prerequisites')."\n";
- Line 1642  my $lctarball = 'loncapa-current.tar.gz'
+ Line 1912  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("After download, the tar.gz file will be extracted into $homedir")."\n\n".
+                   &mt('Download the production release? ~[Y/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("After download, the tar.gz file will be extracted into $homedir")."\n\n".
+               &mt('Download the production release? ~[Y/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 {
-             $callsub{'download'} = 0;
          }
      }
  } elsif ($filetouse ne '') {
- Line 1700  if ($callsub{'pwauth'}) {
+ Line 1955  if ($callsub{'pwauth'}) {
  if ($callsub{'mysql'}) {
      if ($dbh) {
-         &setup_mysql($callsub{'mysqlperms'},$dbh,$has_pass,
+         &setup_mysql($callsub{'mysqlperms'},$distro,$dbh,$has_pass,$has_lcdb);
-                      $mysql_unix_socket,$has_lcdb,$distro);
      } else {
          print &mt('Unable to configure MySQL because access is denied.')."\n";
      }
- Line 1709  if ($callsub{'mysql'}) {
+ Line 1963  if ($callsub{'mysql'}) {
      &print_and_log(&mt('Skipping configuration of MySQL.')."\n");
      if ($callsub{'mysqlperms'}) {
          if ($dbh) {
-             &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket);
+             &setup_mysql_permissions($dbh,$has_pass);
          } else {
              print &mt('Unable to configure MySQL because access is denied.')."\n";
          }
- Line 1727  if ($dbh) {
+ Line 1981  if ($dbh) {
  if ($callsub{'apache'}) {
      if ($distro =~ /^(suse|sles)/) {
-         &copy_apache2_suseconf($instdir,$distro);
+         &copy_apache2_suseconf($instdir,$hostname,$distro);
      } elsif ($distro =~ /^(debian|ubuntu)/) {
-         &copy_apache2_debconf($instdir,$distro);
+         &copy_apache2_debconf($instdir,$distro,$hostname);
      } else {
-         &copy_httpd_conf($instdir,$distro);
+         &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') {
- Line 1788  if ($callsub{'firewall'}) {
+ Line 2077  if ($callsub{'firewall'}) {
          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".
+             print &mt('If you would the like to allow access to ssh from outside, use the command[_1].',
-                   "firewall-cmd --permanent --zone=$zone --add-service=ssh\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].',
- Line 1819  if ($callsub{'firewall'}) {
+ Line 2106  if ($callsub{'firewall'}) {
                  }
              }
          }
-     } elsif ($distro =~ /^(scientific|oracle)/) {
+     } elsif ($distro =~ /^scientific/) {
          print &mt('Use [_1] to configure the firewall to allow access for [_2].',
                    'system-config-firewall-tui -- Customize',
                    'ssh, http')."\n";
      } else {
          my $version;
-         if ($distro =~ /^(redhat|centos|rocky|alma)(\d+)/) {
+         if ($distro =~ /^(redhat|centos)(\d+)$/) {
              $version = $1;
          }
          if ($version > 5) {
- Line 1886  if ($callsub{'download'}) {
+ Line 2173  if ($callsub{'download'}) {
  }
  print "\n".&mt('Requested configuration complete.')."\n\n";
+ my $apachename;
  if ($have_tarball && !$updateshown) {
      my ($lcdir) = ($sourcetarball =~ /^([\w.\-]+)\.tar.gz$/);
-     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 = '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 =~ /^sles(\d+)$/) {
-         if ($1 > 12) {
-             $lc_uses_systemctl = 1;
-         }
-     }
      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';
+         print &mt('If you are now ready to update LON-CAPA, enter the following commands:')."\n\n".
-         if ($lc_uses_systemctl) {
+                   "/etc/init.d/loncontrol stop\n";
-             $lcstop = 'systemctl stop loncontrol';
+         if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) {
-         }
+             if (($1 eq 'suse') && ($2 < 10)) {
-         my $apachestop = "/etc/init.d/$apachename stop";
+                 $apachename = 'apache';
-         if ($uses_systemctl) {
+             } else {
-             $apachestop = "systemctl stop $apachename";
+                 $apachename = 'apache2';
-         }
+             }
-         if ($uses_sudo) {
+         } else {
-             $lcstop = 'sudo '.$lcstop;
+             $apachename = 'httpd';
-             $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') {
-         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 "/etc/init.d/$apachename stop\n";
-         print "$apachestart\n";
+     }
+     print "cd /root\n".
+           "tar zxf $sourcetarball\n".
+           "cd $lcdir\n".
+           "./UPDATE\n";
+     if (-e '/etc/loncapa-release') {
+         print "/etc/init.d/loncontrol start\n";
+         print "/etc/init.d/$apachename start\n";
      }
  }
  exit;
- Line 2149  sub kill_extra_services {
+ Line 2382  sub kill_extra_services {
  }
  sub setup_mysql {
-     my ($setup_mysql_permissions,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,$distro) = @_;
+     my ($setup_mysql_permissions,$distro,$dbh,$has_pass,$has_lcdb) = @_;
      my @mysql_lc_commands;
      unless ($has_lcdb) {
-         my $createcmd = 'CREATE DATABASE loncapa';
+         push(@mysql_lc_commands,"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, 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_unix_socket,@mysql_lc_commands);
+         &setup_mysql_permissions($dbh,$has_pass,@mysql_lc_commands);
      } else {
          print_and_log(&mt('Skipping MySQL permissions setup.')."\n");
          if ($dbh) {
- Line 2186  CREATE TABLE IF NOT EXISTS metadata (tit
+ Line 2409  CREATE TABLE IF NOT EXISTS metadata (tit
  }
  sub setup_mysql_permissions {
-     my ($dbh,$has_pass,$mysql_unix_socket,@mysql_lc_commands) = @_;
+     my ($dbh,$has_pass,@mysql_lc_commands) = @_;
      my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
-     my ($usescreate,$usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
+     my ($usesauth,$is_mariadb,$hasauthcol,@mysql_commands);
      if ($mysqlname =~ /^MariaDB/i) {
          $is_mariadb = 1;
-         if ($mysqlversion >= 10.4) {
+         if ($mysqlversion >= 10.2) {
-             $usescreate = 1;
-         } elsif ($mysqlversion >= 10.2) {
              $usesauth = 1;
          } elsif ($mysqlversion >= 5.5) {
              $hasauthcol = 1;
- Line 2205  sub setup_mysql_permissions {
+ Line 2426  sub setup_mysql_permissions {
              $hasauthcol = 1;
          }
      }
-     if ($usescreate) {
+     if ($usesauth) {
-         @mysql_commands = ("CREATE USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
+         @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')");
-     } 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 {
- Line 2228  INSERT db (Host,Db,User,Select_priv,Inse
+ Line 2446  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) || ($mysql_unix_socket)) {
+     if ($has_pass) {
          if ($dbh) {
              push(@mysql_commands,"FLUSH PRIVILEGES");
              if (@mysql_commands) {
- Line 2320  sub get_mysql_version {
+ Line 2538  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";
- Line 2336  sub get_mysql_version {
+ Line 2554  sub get_mysql_version {
  ###########################################################
  sub copy_httpd_conf {
-     my ($instdir,$distro) = @_;
+     my ($instdir,$distro,$hostname) = @_;
      my $configfile = 'httpd.conf';
-     if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+     if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
          if ($1 >= 7) {
              $configfile = 'apache2.4/httpd.conf';
          } elsif ($1 > 5) {
- Line 2359  sub copy_httpd_conf {
+ Line 2577  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
+ ## Copy loncapassl.conf and sslrewrite.conf
- ## 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) = @_;
+ # The Apache SSL configuration used by LON-CAPA is contained in
-     my $mpmfile = 'mpm.conf';
+ # two files: sslrewrite.conf and loncapassl.conf.
-     if ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") &&
+ #
-         (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) {
+ # Starting with LON-CAPA 2.12, name-based virtual hosts are used
-         print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'mpm.conf'",
+ # with port 443. The default virtual host (i.e., the one listed
-                       "'/etc/httpd/conf.modules.d/00-mpm.conf'")."\n");
+ # first) is for the server's standard hostname, and that is the one
-         copy "$instdir/centos-rhes-fedora-sl/$mpmfile","/etc/httpd/conf.modules.d/00-mpm.conf";
+ # which will respond to client browser requests for https:// pages.
-         chmod(0644,"/etc/httpd/conf.modules.d/00-mpm.conf");
+ #
-         print_and_log("\n");
+ # Accordingly, a system administrator will need to edit the config
-     } else {
+ # config file to include paths to a signed SSL certificate (public),
-         my $logfail;
+ # chain (public) and key (private) pem files. The certificate should
-         if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
+ # have been signed by a recognized certificate authority ((e.g.,
-             if ($1 > 7) {
+ # InCommon or Let's Encrypt).
-                 $logfail = 1;
+ #
+ # 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 ++;
              }
-         } elsif ($distro =~ /^fedora(\d+)$/) {
+             close($fh);
-             if ($1 > 26) {
+         }
-                 $logfail = 1;
+     }
+     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 ($logfail) {
+         if (@possfiles == 0) {
-             print_and_log(&mt('Warning: copying the LON-CAPA [_1] failed because [_2] and/or [_3] are missing.',
+             $configfile = 'ssl.conf';
-                               $mpmfile,"'$instdir/centos-rhes-fedora-sl/$mpmfile'",
+             if ($distro =~ /^(suse|sles)/) {
-                               "'/etc/httpd/conf.modules.d/00-mpm.conf'"));
+                 $configfile = 'vhost-ssl.conf';
-             print_and_log("\n");
+             } 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;
  }
  #########################################################
- Line 2411  sub copy_mpm_conf {
+ Line 3062  sub copy_mpm_conf {
  #########################################################
  sub copy_apache2_debconf {
-     my ($instdir,$distro) = @_;
+     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') {
- Line 2423  sub copy_apache2_debconf {
+ Line 3074  sub copy_apache2_debconf {
      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;
- Line 2432  sub copy_apache2_debconf {
+ Line 3082  sub copy_apache2_debconf {
      if (($distname eq 'ubuntu') && ($version > 12)) {
          $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
      }
-     my ($skipconf,$skipsite,$skipstatus);
+     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';
-         my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
+         if (-e "$apache2_conf_available_dir/loncapa") {
-         if ((-e "$apache2_conf_available_dir/loncapa") && (-e "$instdir/debian-ubuntu/ubuntu14/loncapa_conf")) {
+             copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
-             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') {
-         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);
-             }
          }
+         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");
  }
- Line 2621  sub copy_apache2_debconf {
+ Line 3124  sub copy_apache2_debconf {
  ###########################################################
  sub copy_apache2_suseconf {
-     my ($instdir,$distro) = @_;
+     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)) {
- Line 2679  sub copy_sysconfig_apache2_file {
+ Line 3182  sub copy_sysconfig_apache2_file {
      if (($name eq 'sles') && ($version >= 12)) {
         $sysconf_file = "$instdir/sles-suse/apache2.4/sysconfig_apache2";
      }
-     copy $sysconf_file,"/etc/sysconfig/apache2";
+     copy "$sysconf_file","/etc/sysconfig/apache2";
      chmod(0444,"/etc/sysconfig/apache2");
  }
- Line 2787  sub download_loncapa {
+ Line 3290  sub download_loncapa {
  	print_and_log("
  ------------------------------------------------------------------------
- ".&mt('You seem to have a version of [_1] in [_2]',$lctarball,$instdir)."\n".
+ ".&mt('You seem to have a version of loncapa-current.tar.gz in [_1]',$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/$lctarball
+ wget http://install.loncapa.org/versions/loncapa-current.tar.gz
  ------------------------------------------------------------------------
  ");
      }
      ##
-     ## untar loncapa-X.Y.Z.tar.gz
+     ## untar loncapa.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");
-         if (-e $homedir) {
+         writelog(`cd ~root; tar zxf $instdir/$lctarball`);
-             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:').
+               &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]',
+ cd /root/loncapa-N.N     (N.N should correspond to a version number like '0.4')
-                   'http://install.loncapa.org/','http://help.loncapa.org/')."\n";
+ ./UPDATE
+ ".&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);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.45.2.18
changed lines
	Added in v.1.55