--- doc/install/linux/install.pl 2019/02/19 19:24:28 1.45.2.2 +++ doc/install/linux/install.pl 2020/05/01 19:02:51 1.65 @@ -26,6 +26,8 @@ use strict; use File::Copy; use Term::ReadKey; +use Socket; +use Sys::Hostname::FQDN(); use DBI; use Cwd(); use File::Basename(); @@ -75,7 +77,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.45.2.2 2019/02/19 19:24:28 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.65 2020/05/01 19:02:51 raeburn Exp $'."\n"; } # @@ -164,7 +166,18 @@ sub get_user_selection { sub get_distro { my ($distro,$gotprereqs,$updatecmd,$packagecmd,$installnow,$unknown); $packagecmd = '/bin/rpm -q LONCAPA-prerequisites '; - if (-e '/etc/redhat-release') { + if (-e '/etc/oracle-release') { + open(IN,'; + chomp($versionstring); + close(IN); + if ($versionstring =~ /^Oracle Linux Server release (\d+)/) { + my $version = $1; + $distro = 'oracle'.$1; + $updatecmd = 'yum install LONCAPA-prerequisites'; + $installnow = 'yum -y install LONCAPA-prerequisites'; + } + } elsif (-e '/etc/redhat-release') { open(IN,'; chomp($versionstring); @@ -194,6 +207,10 @@ sub get_distro { $distro = 'rhes'.$1; $updatecmd = 'yum install LONCAPA-prerequisites'; $installnow = 'yum -y install LONCAPA-prerequisites'; + } elsif ($versionstring =~ /Red Hat Enterprise Linux release (\d+)/) { + $distro = 'rhes'.$1; + $updatecmd = 'dnf install LONCAPA-prerequisites'; + $installnow = 'dnf -y install LONCAPA-prerequisites'; } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) { $distro = 'centos'.$1; $updatecmd = 'yum install LONCAPA-prerequisites'; @@ -306,12 +323,74 @@ sub get_distro { $unknown = 1; } } else { - print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora or scientific linux system.')."\n"; + print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora, scientific linux, or oracle linux system.')."\n"; } } return ($distro,$packagecmd,$updatecmd,$installnow); } +# +# 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 = ; + chomp($choice); + $choice =~ s/(^\s+|\s+$)//g; + if ($choice eq '') { + print &mt("Hostname you entered was either blank or contanied only white space.\n"); + } elsif ($choice =~ /^[\w\.\-]+$/) { + $hostname = $choice; + } else { + print &mt("Hostname you entered was invalid -- a hostname may only contain letters, numbers, - and .\n"); + } + while ($hostname eq '') { + $hostname = &get_hostname(); + } + print "\n"; + return $hostname; +} + +# +# get_hostip() prompts the user to provide the server's IPv4 IP address +# +# If invalid input is provided, the routine is called recursively +# until, a valid IPv4 address is provided. +# + +sub get_hostip { + my $hostip; + print &mt('Enter the IP address of this server, e.g., 192.168.10.24'."\n"); + my $choice = ; + 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; @@ -342,23 +421,26 @@ sub check_prerequisites { sub check_locale { my ($distro) = @_; - my ($fh,$langvar,$command); + my ($fh,$langvar,$command,$earlyout); $langvar = 'LANG'; if ($distro =~ /^(ubuntu|debian)/) { if (!open($fh,"= 15)) { if (!open($fh,"= 7) { if (!open($fh,"; chomp(@data); foreach my $item (@data) { @@ -401,9 +488,13 @@ sub check_locale { $command = 'sudo locale-gen en_US.UTF-8'."\n". 'sudo update-locale LANG=en_US.UTF-8'; } elsif ($distro =~ /^(suse|sles)/) { - $command = 'yast language'; - } else { + $command = 'yast language'; + } elsif (-e '/usr/bin/system-config-language') { $command = 'system-config-language'; + } elsif (-e '/usr/bin/localectl') { + $command = '/usr/bin/localectl set-locale LANG=en_US.UTF-8'; + } else { + $command = 'No standard command found'; } } last; @@ -428,7 +519,8 @@ sub check_required { return ($distro,$gotprereqs,$localecmd); } my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$has_lcdb,%recommended, - $downloadstatus,$filetouse,$production,$testing,$apachefw,$tostop,$uses_systemctl); + $downloadstatus,$filetouse,$production,$testing,$apachefw,$tostop, + $uses_systemctl,$hostname,$hostip); my $wwwuid = &uid_of_www(); my $wwwgid = getgrnam('www'); if (($wwwuid eq '') || ($wwwgid eq '')) { @@ -437,6 +529,25 @@ sub check_required { unless( -e "/usr/local/sbin/pwauth") { $recommended{'pwauth'} = 1; } + $hostname = Sys::Hostname::FQDN::fqdn(); + if ($hostname eq '') { + $hostname =&get_hostname(); + } else { + print &mt("Hostname detected: $hostname. Is that correct? ~[Y/n~]"); + if (!&get_user_selection(1)) { + $hostname =&get_hostname(); + } + } + $hostip = Socket::inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost'); + if ($hostip eq '') { + $hostip=&get_hostip(); + } else { + print &mt("Host IP address detected: $hostip. Is that correct? ~[Y/n~]"); + if (!&get_user_selection(1)) { + $hostip=&get_hostip(); + } + } + print_and_log("\n".&mt('Hostname is [_1] and IP address is [_2]',$hostname,$hostip)."\n"); $mysqlon = &check_mysql_running($distro); if ($mysqlon) { my $mysql_has_wwwuser = &check_mysql_wwwuser(); @@ -465,15 +576,20 @@ 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(); return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow, $mysqlrestart,\%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus, - $filetouse,$production,$testing,$apachefw,$uses_systemctl); + $filetouse,$production,$testing,$apachefw,$uses_systemctl,$hostname, + $hostip,$sslhostsfilesref,$has_std,$has_int,$rewritenum,$nochgstd, + $nochgint); } sub check_mysql_running { @@ -499,7 +615,7 @@ sub check_mysql_running { if ($1 >= 19) { $mysqldaemon ='mariadb'; } - } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) { + } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) { if ($1 >= 7) { $mysqldaemon ='mariadb'; $process = 'mysqld'; @@ -626,6 +742,9 @@ sub chkconfig { if (($distro =~ /^ubuntu/) && ($version <= 8)) { $daemon{'cups'} = 'cupsys'; } + if (($distro =~ /^ubuntu/) && ($version >= 18)) { + $daemon{'ntp'} = 'chrony'; + } } elsif ($distro =~ /^fedora(\d+)/) { my $version = $1; if ($version >= 15) { @@ -640,7 +759,10 @@ sub chkconfig { if ($version >= 19) { $daemon{'mysql'} = 'mariadb'; } - } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) { + if ($version >= 26) { + $daemon{'ntp'} = 'chronyd'; + } + } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) { my $version = $1; if ($version >= 7) { $uses_systemctl{'ntp'} = 1; @@ -650,6 +772,9 @@ sub chkconfig { $uses_systemctl{'cups'} = 1; $daemon{'mysql'} = 'mariadb'; } + if (($version >= 8) || ($distro eq 'oracle7')) { + $daemon{'ntp'} = 'chronyd'; + } } my $nocheck; if (! -x $checker_bin) { @@ -744,7 +869,7 @@ sub chkconfig { sub uses_firewalld { my ($distro) = @_; - my ($inuse, $checkfirewalld); + my ($inuse,$checkfirewalld,$zone); if ($distro =~ /^(suse|sles)([\d\.]+)$/) { if (($1 eq 'sles') && ($2 >= 15)) { $checkfirewalld = 1; @@ -753,7 +878,7 @@ sub uses_firewalld { if ($1 >= 18) { $checkfirewalld = 1; } - } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) { + } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) { if ($1 >= 7) { $checkfirewalld = 1; } @@ -774,9 +899,18 @@ sub uses_firewalld { } if (($loaded eq 'loaded') || ($active eq 'active')) { $inuse = 1; + my $cmd = 'firewall-cmd --get-default-zone'; + if (open(PIPE,"$cmd |")) { + my $result = ; + chomp($result); + close(PIPE); + if ($result =~ /^\w+$/) { + $zone = $result; + } + } } } - return $inuse; + return ($inuse,$zone); } sub chkfirewall { @@ -787,19 +921,20 @@ sub chkfirewall { https => 443, ); my %activefw; - if (&firewall_is_active()) { - if (&uses_firewalld($distro)) { - my %current; - if (open(PIPE,'firewall-cmd --permanent --zone=public --list-services |')) { - my $svc = ; - close(PIPE); - chomp($svc); - map { $current{$_} = 1; } (split(/\s+/,$svc)); - } - if ($current{'http'} && $current{'https'}) { - $configfirewall = 0; - } - } else { + my ($firewalld,$zone) = &uses_firewalld($distro); + if ($firewalld) { + my %current; + if (open(PIPE,'firewall-cmd --permanent --zone='.$zone.' --list-services |')) { + my $svc = ; + close(PIPE); + chomp($svc); + map { $current{$_} = 1; } (split(/\s+/,$svc)); + } + if ($current{'http'} && $current{'https'}) { + $configfirewall = 0; + } + } else { + if (&firewall_is_active()) { my $iptables = &get_pathto_iptables(); if ($iptables eq '') { print &mt('Firewall not checked as path to iptables not determined.')."\n"; @@ -821,9 +956,9 @@ sub chkfirewall { print &mt('Firewall not checked as iptables Chains not identified.')."\n"; } } + } else { + print &mt('Firewall not enabled.')."\n"; } - } else { - print &mt('Firewall not enabled.')."\n"; } return ($configfirewall,\%activefw); } @@ -882,6 +1017,20 @@ sub chkapache { } } } + if ((!$fixapache) && ($distname eq 'ubuntu')) { + my $sitestatus = "/etc/apache2/mods-available/status.conf"; + my $stdstatus = "$instdir/debian-ubuntu/status.conf"; + if ((-e $stdstatus) && (-e $sitestatus)) { + if (open(PIPE, "diff --brief $stdstatus $sitestatus |")) { + my $diffres = ; + close(PIPE); + chomp($diffres); + if ($diffres) { + $fixapache = 1; + } + } + } + } } elsif ($distro =~ /^(suse|sles)([\d\.]+)$/) { my ($name,$version) = ($1,$2); my $apache = 'apache'; @@ -921,7 +1070,8 @@ sub chkapache { } } else { my $configfile = 'httpd.conf'; - if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) { + my $mpmfile = 'mpm.conf'; + if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) { if ($1 >= 7) { $configfile = 'apache2.4/httpd.conf'; } elsif ($1 > 5) { @@ -929,7 +1079,7 @@ sub chkapache { } } elsif ($distro =~ /^fedora(\d+)$/) { if ($1 > 17) { - $configfile = 'apache2.4/httpd.conf'; + $configfile = 'apache2.4/httpd.conf'; } elsif ($1 > 10) { $configfile = 'new/httpd.conf'; } @@ -947,10 +1097,312 @@ sub chkapache { } } } + if (-e "/etc/httpd/conf.modules.d/00-mpm.conf") { + if (!-e "$instdir/centos-rhes-fedora-sl/$mpmfile") { + print &mt('Warning: No LON-CAPA Apache MPM configuration file found for installation check.')."\n"; + } elsif ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") && (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) { + if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/$mpmfile /etc/httpd/conf.modules.d/00-mpm.conf |")) { + my $diffres = ; + close(PIPE); + chomp($diffres); + if ($diffres) { + $fixapache = 1; + } + } + } + } } return $fixapache; } +# +# chkapachessl() determines whether a server's Apache SSL configuration +# needs updating to support LON-CAPA. +# +# LON-CAPA uses VirtualHosts for port 443, and requires that they are +# defined in one Apache configuration file containing two VirtualHost +# blocks, in order: +# +# (1) a block with no ServerName, or with ServerName set to the +# server's hostname. This block should contain: +# +# +# LON-CAPA rewrite rules defined in sslrewrite.conf +# +# +# (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 +# rewrite blocks. +# +# The best candidate is the one containing a block: +# +# (where ????? might be _default_ or * or an IP address) +# +# +# +# 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 +# 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 ''); + next if ($_ eq ''); + 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 ''); + next if ($_ eq ''); + 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*\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*/) { + $rewrite = 1; + $has_rewrite = 1; + if ($currname eq '') { + $currname = $hostname; + } + $rewrites{$file}[$num] = []; + } + } + } elsif (/^\s*\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 ($fixapachessl,\%sslfiles,$has_std,$has_int,$rewritenum,$nochgstd,$nochgint); +} + +# +# compare_arrays() expects two refs to arrays as args. +# +# The contents of the two arrays are compared, and if they +# are different, and array of the differences is returned. +# + +sub compare_arrays { + my ($arrayref1,$arrayref2) = @_; + my (@difference,%count); + @difference = (); + %count = (); + if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { + foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; } + foreach my $element (keys(%count)) { + if ($count{$element} == 1) { + push(@difference,$element); + } + } + } + return @difference; +} + sub chksrvcs { my ($distro,$tostop) = @_; my %stopsrvcs; @@ -1350,11 +1802,12 @@ print " ".&mt('3.')." ".&mt('Set-up the MySQL database.')." ".&mt('4.')." ".&mt('Set-up MySQL permissions.')." ".&mt('5.')." ".&mt('Configure Apache web server.')." -".&mt('6.')." ".&mt('Configure start-up of services.')." -".&mt('7.')." ".&mt('Check firewall settings.')." -".&mt('8.')." ".&mt('Stop services not used by LON-CAPA,')." +".&mt('6.')." ".&mt('Configure SSL for Apache web server.')." +".&mt('7.')." ".&mt('Configure start-up of services.')." +".&mt('8.')." ".&mt('Check firewall settings.')." +".&mt('9.')." ".&mt('Stop services not used by LON-CAPA,')." ".&mt('i.e., services for a print server: [_1] daemon.',"'cups'")." -".&mt('9.')." ".&mt('Download LON-CAPA source code in readiness for installation.')." +".&mt('10.')." ".&mt('Download LON-CAPA source code in readiness for installation.')." ".&mt('Typically, you will run this script only once, when you first install LON-CAPA.')." @@ -1384,30 +1837,32 @@ 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,$has_lcdb,$downloadstatus,$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, '. - 'openSuSE, SLES, Ubuntu LTS, Debian')."\n\n". + 'Oracle Linux, openSuSE, SLES, Ubuntu LTS, Debian')."\n\n". &mt('Stopping execution.')."\n"; exit; } @@ -1430,7 +1885,6 @@ 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~]'); @@ -1570,16 +2024,53 @@ if ($dbh) { if ($callsub{'apache'}) { if ($distro =~ /^(suse|sles)/) { - ©_apache2_suseconf($instdir,$distro); + ©_apache2_suseconf($instdir,$hostname,$distro); } elsif ($distro =~ /^(debian|ubuntu)/) { - ©_apache2_debconf($instdir,$distro); + ©_apache2_debconf($instdir,$distro,$hostname); } else { - ©_httpd_conf($instdir,$distro); + ©_httpd_conf($instdir,$distro,$hostname); + ©_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) = + ©_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') { @@ -1608,9 +2099,10 @@ if ($callsub{'runlevels'}) { } if ($callsub{'firewall'}) { - if (&uses_firewalld($distro)) { + my ($firewalld,$zone) = &uses_firewalld($distro); + if ($firewalld) { my (%current,%added); - if (open(PIPE,'firewall-cmd --permanent --zone=public --list-services |')) { + if (open(PIPE,"firewall-cmd --permanent --zone=$zone --list-services |")) { my $svc = ; close(PIPE); chomp($svc); @@ -1618,7 +2110,7 @@ if ($callsub{'firewall'}) { } foreach my $service ('http','https') { unless ($current{$service}) { - if (open(PIPE,"firewall-cmd --permanent --zone=public --add-service=$service |")) { + if (open(PIPE,"firewall-cmd --permanent --zone=$zone --add-service=$service |")) { my $result = ; if ($result =~ /^success/) { $added{$service} = 1; @@ -1636,7 +2128,7 @@ if ($callsub{'firewall'}) { } unless ($current{'ssh'}) { print &mt('If you would the like to allow access to ssh from outside, use the command[_1].', - 'firewall-cmd --permanent --zone=public --add-service=ssh')."\n"; + "firewall-cmd --permanent --zone=$zone --add-service=ssh")."\n"; } } elsif ($distro =~ /^(suse|sles)/) { print &mt('Use [_1] to configure the firewall to allow access for [_2].', @@ -1658,14 +2150,24 @@ if ($callsub{'firewall'}) { } } } - } elsif ($distro =~ /^scientific/) { + } elsif ($distro =~ /^(scientific|oracle)/) { print &mt('Use [_1] to configure the firewall to allow access for [_2].', 'system-config-firewall-tui -- Customize', 'ssh, http')."\n"; } else { - print &mt('Use [_1] to configure the firewall to allow access for [_2].', - 'setup -- Firewall configuration -> Customize', - 'ssh, http, https')."\n"; + my $version; + if ($distro =~ /^(redhat|centos)(\d+)$/) { + $version = $1; + } + if ($version > 5) { + print &mt('Use [_1] to configure the firewall to allow access for [_2].', + 'system-config-firewall-tui -- Customize', + 'ssh, http')."\n"; + } else { + print &mt('Use [_1] to configure the firewall to allow access for [_2].', + 'setup -- Firewall configuration -> Customize', + 'ssh, http, https')."\n"; + } } } else { &print_and_log(&mt('Skipping Firewall configuration.')."\n"); @@ -2080,7 +2582,7 @@ sub get_mysql_version { my $info = ; 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"; @@ -2096,9 +2598,9 @@ sub get_mysql_version { ########################################################### sub copy_httpd_conf { - my ($instdir,$distro) = @_; + my ($instdir,$distro,$hostname) = @_; my $configfile = 'httpd.conf'; - if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) { + if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) { if ($1 >= 7) { $configfile = 'apache2.4/httpd.conf'; } elsif ($1 > 5) { @@ -2119,6 +2621,527 @@ sub copy_httpd_conf { print_and_log("\n"); } +########################################################### +## +## RHEL/CentOS/Fedora/Scientific Linux +## Copy LON-CAPA mpm.conf to /etc/httpd/conf.modules.d/00-mpm.conf +## +## The LON-CAPA mpm.conf enables the prefork MPM module in +## Apache. This is also the default for RHEL/CentOS/Oracle +## Linux 7 and earlier, and Fedora 26 and earlier. For more +## recent versions of those distros, the event MPM is enabled +## by default. After ©_mpm_conf() is run, the prefork MPM +## module will be enabled instead of the event MPM module. +## +########################################################### + +sub copy_mpm_conf { + my ($instdir,$distro) = @_; + my $mpmfile = 'mpm.conf'; + if ((-e "/etc/httpd/conf.modules.d/00-mpm.conf") && + (-e "$instdir/centos-rhes-fedora-sl/$mpmfile")) { + print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'mpm.conf'", + "'/etc/httpd/conf.modules.d/00-mpm.conf'")."\n"); + copy "$instdir/centos-rhes-fedora-sl/$mpmfile","/etc/httpd/conf.modules.d/00-mpm.conf"; + chmod(0644,"/etc/httpd/conf.modules.d/00-mpm.conf"); + print_and_log("\n"); + } else { + my $logfail; + if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) { + if ($1 > 7) { + $logfail = 1; + } + } elsif ($distro =~ /^fedora(\d+)$/) { + if ($1 > 26) { + $logfail = 1; + } + } + if ($logfail) { + print_and_log(&mt('Warning: copying the LON-CAPA [_1] failed because [_2] and/or [_3] are missing.', + $mpmfile,"'$instdir/centos-rhes-fedora-sl/$mpmfile'", + "'/etc/httpd/conf.modules.d/00-mpm.conf'")); + print_and_log("\n"); + } + } +} + +############################################### +## +## Copy loncapassl.conf and sslrewrite.conf +## +############################################### + +# +# The Apache SSL configuration used by LON-CAPA is contained in +# two files: sslrewrite.conf and loncapassl.conf. +# +# Starting with LON-CAPA 2.12, name-based virtual hosts are used +# with port 443. The default virtual host (i.e., the one listed +# first) is for the server's standard hostname, and that is the one +# which will respond to client browser requests for https:// pages. +# +# Accordingly, a system administrator will need to edit the config +# config file to include paths to a signed SSL certificate (public), +# chain (public) and key (private) pem files. The certificate should +# have been signed by a recognized certificate authority ((e.g., +# InCommon or Let's Encrypt). +# +# The sslrewrite.conf file contains the rewrite configuration for +# the default virtual host. The rewrite rules defined are used to +# allow internal HEAD requests to /cgi-bin/mimetex.cgi to be served +# http://, in order to support vertical alignment of mimetex images +# (one of the options for rendering Math content); (b) allow requests +# for certain URLs (external resource, and syllabus, if external URL +# used) to be served http:// to accommodate the use of iframes which +# would otherwise result in browser blocking of mixed active content. +# +# The loncapassl.conf file contains the configuration for the +# "internal" virtual host, which will respond to requests for https:// +# pages from other LON-CAPA servers in the network to which the node +# belongs. The ServerName is internal- where +# is the server's hostname. There is no need to create a DNS entry +# for internal-, 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 +# blocks will be appended to +# the standard Apache SSL config for the particular distro: +# ssl.conf for RHEL/CentOS/Scientific/Fedora, vhost-ssl.conf +# for SuSE/SLES, and default-ssl.conf for Ubuntu. +# +# Once a file is selected, the contents of sslrewrite.conf and +# loncapassl.conf are compared with appropriate blocks in the file +# and the user will be prompted to agree to insertion of missing lines +# and/or deletion of surplus lines. +# + +sub copy_apache_sslconf_files { + my ($distro,$hostname,$hostip,$instdir,$targetdir,$targetfilesref, + $has_std,$has_int,$rewritenum,$nochgstd,$nochgint) = @_; + my ($new_std,$new_int); + my (@internal,@standard,%int_by_linenum,%int_by_linetext, + %rule_by_linenum,%rule_by_linetext,%foundint); + if (-e "$instdir/loncapassl.conf") { + if (open(my $fh,'<',"$instdir/loncapassl.conf")) { + my $num = 1; + while (<$fh>) { + chomp(); + if (/^ServerName/) { + s/(\Qinternal-{[[[[Hostname]]]]}\E)/internal-$hostname/; + } + push(@internal,$_); + $int_by_linenum{$num} = $_; + s/(^\s+|\s+$)//g; + push(@{$int_by_linetext{$_}},$num); + $num ++; + } + close($fh); + } + } + if (-e "$instdir/sslrewrite.conf") { + if (open(my $fh,'<',"$instdir/sslrewrite.conf")) { + my $num = 1; + while (<$fh>) { + chomp(); + if (/\Q{[[[[HostIP]]]]}\E/) { + s/(\QRewriteCond %{REMOTE_ADDR} {[[[[HostIP]]]]}\E)/RewriteCond %{REMOTE_ADDR} $hostip/; + } + push(@standard,$_); + $rule_by_linenum{$num} = $_; + s/(^\s+|\s+$)//g; + push(@{$rule_by_linetext{$_}},$num); + $num ++; + } + close($fh); + } + } + if (!$nochgstd) { + if ($has_std eq '') { + my $file; + if ($has_int ne '') { + if (open(my $fh,'<',"$targetdir/$has_int")) { + my @saved = <$fh>; + close($fh); + if (open(my $fhout, '>',"$targetdir/$has_int")) { + print $fhout "\n". + "ServerName $hostname\n". + join("\n",@standard)."\n". + "\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 "\n". + "ServerName $hostname\n". + join("\n",@standard)."\n". + "\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 +# 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 = 1; + unless ($endvhost) { + $startvhost = $currline; + } + } + if ($virtualhost) { + if (/^ServerName\s+([^\s]+)\s*$/) { + $currname = $1; + unless ($endvhost) { + if ((($currname eq '') || ($currname eq $hostname)) && ($type eq 'std')) { + $hasname = 1; + } + } + } + if (/^<\/VirtualHost>/) { + $virtualhost = 0; + unless ($endvhost) { + if (((($currname eq '') || ($currname eq $hostname)) && ($type eq 'std')) || + (($currname eq 'internal-'.$hostname) && ($type eq 'int'))) { + $endvhost = $currline; + } else { + undef($startvhost); + } + } + } + } + } + close($fh); + } + if ($endvhost) { + if (open(my $fout,'>',"$targetdir/$filename")) { + for (my $i=0; $i<@lines; $i++) { + if ($i == $startvhost) { + unless (($hasname) && ($type eq 'std')) { + print $fout "ServerName $hostname\n"; + } + } + if ($i == $endvhost-1) { + foreach my $item (sort { $a <=> $b } keys(%{$by_linenum})) { + print $fout $by_linenum->{$item}."\n"; + } + } + print $fout $lines[$i]; + } + close($fout); + } + } + } + return $endvhost; +} + +# +# get_sslconf_filename() is called when the Apache SSL configuration +# option has been selected and there are no files containing +# VirtualHost definitions containing rewrite blocks, +# +# In this case get_sslconf_filename() is used to chose from the +# available .conf files containing VirtualHosts definitions. If +# there is ambiguity about which file to use, &apacheconf_choice() +# will be called to prompt the user to choose one of the possible +# files. +# + +sub get_sslconf_filename { + my ($distro,$targetdir,$targetfilesref) = @_; + my ($configfile,$numfiles,@possfiles); + if (ref($targetfilesref) eq 'HASH') { + if (keys(%{$targetfilesref}) > 0) { + foreach my $name (sort(keys(%{$targetfilesref}))) { + if (ref($targetfilesref->{$name}) eq 'HASH') { + foreach my $file (sort(keys(%{$targetfilesref->{$name}}))) { + next if ($file eq ''); + next if (!-e "$targetdir/$file"); + unless (grep(/^\Q$file\E$/,@possfiles)) { + push(@possfiles,$file); + } + } + } + } + } + if (@possfiles == 0) { + $configfile = 'ssl.conf'; + if ($distro =~ /^(suse|sles)/) { + $configfile = 'vhost-ssl.conf'; + } elsif ($distro =~ /^(debian|ubuntu)/) { + $configfile = 'default-ssl.conf'; + } + $numfiles = 0; + print &mt('No configuration files in [_1] contain a 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 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 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 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 = ; + 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 blocks containing +# (a) the default VirtualHost with the 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*\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*/) { + $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 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 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 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 block:')."\n". + $by_linenum->{$i}."\n". + &mt('Add this line? ~[Y/n~]'); + if (&get_user_selection(1)) { + print $fout $by_linenum->{$i}."\n"; + } + } + print $fout $line; + } else { + print $fout $line; + } + } + close($fout); + } + } + } + return $filename; +} + ######################################################### ## ## Ubuntu/Debian -- copy our loncapa configuration file to @@ -2127,7 +3150,7 @@ sub copy_httpd_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') { @@ -2147,35 +3170,116 @@ sub copy_apache2_debconf { if (($distname eq 'ubuntu') && ($version > 12)) { $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf"; } - if (-l $defaultconfig) { - unlink($defaultconfig); - } + my ($skipconf,$skipsite,$skipstatus); if (($distname eq 'ubuntu') && ($version > 12)) { - print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa.conf symlink'")."\n"); my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled'; my $apache2_conf_available_dir = '/etc/apache2/conf-available'; - if (-e "$apache2_conf_available_dir/loncapa") { - copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original"); - } my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf'; - copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa"); - chmod(0444,"$apache2_conf_available_dir/loncapa"); - if (-l $defaultconf) { - unlink($defaultconf); - } - symlink("$apache2_conf_available_dir/loncapa","$defaultconf"); - print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default.conf symlink'")."\n"); - copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa"); - chmod(0444,"$apache2_sites_available_dir/loncapa"); - symlink("$apache2_sites_available_dir/loncapa","$defaultconfig"); - } else { - print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n"); - if (-e "$apache2_sites_available_dir/loncapa") { - copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original"); - } - copy("$instdir/debian-ubuntu/loncapa","$apache2_sites_available_dir/loncapa"); - chmod(0444,"$apache2_sites_available_dir/loncapa"); - symlink("$apache2_sites_available_dir/loncapa","$apache2_sites_enabled_dir/000-default"); + if ((-e "$apache2_conf_available_dir/loncapa") && (-e "$instdir/debian-ubuntu/ubuntu14/loncapa_conf")) { + if (open(PIPE, "diff --brief $apache2_conf_available_dir/loncapa $instdir/debian-ubuntu/ubuntu14/loncapa_conf" |")) { + my $diffres = ; + close(PIPE); + chomp($diffres); + if ($diffres) { + copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original"); + } + if (-l $defaultconf) { + my $linkfname = readlink($defaultconf); + if ($linkfname eq "$apache2_conf_available_dir/loncapa") { + unless ($diffres) { + $skipconf = 1; + } + } + } + } + } + unless ($skipconf) { + print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa.conf symlink'")."\n"); + copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa"); + chmod(0444,"$apache2_conf_available_dir/loncapa"); + if (-l $defaultconf) { + unlink($defaultconf); + } + symlink("$apache2_conf_available_dir/loncapa","$defaultconf"); + } + my $stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_site"; + if ((-e $stdsite) && (-e "$apache2_sites_available_dir/loncapa")) { + if (open(PIPE, "diff --brief $stdsite $apache2_sites_available_dir/loncapa |")) { + my $diffres = ; + close(PIPE); + chomp($diffres); + if ($diffres) { + copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original"); + } + if (-l $defaultconfig) { + my $linkfname = readlink($defaultconfig); + if ($linkfname eq "$apache2_sites_available_dir/loncapa") { + unless ($diffres) { + $skipsite = 1; + } + } + } + } + } + unless ($skipsite) { + print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default.conf symlink'")."\n"); + copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa"); + chmod(0444,"$apache2_sites_available_dir/loncapa"); + symlink("$apache2_sites_available_dir/loncapa","$defaultconfig"); + } + } else { + if ((-e "$instdir/debian-ubuntu/loncapa") && (-e "$apache2_sites_available_dir/loncapa")) { + if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa $apache2_sites_available_dir/loncapa |")) { + my $diffres = ; + 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 = ; + close(PIPE); + chomp($diffres); + if ($diffres) { + copy("$apache2_mods_available_dir/status.conf","$apache2_mods_available_dir/status.conf.original"); + } else { + $skipstatus = 1; + } + } + } + unless ($skipstatus) { + if (-e $stdstatus) { + print_and_log(&mt('Copying loncapa [_1] file to [_2],',"'status.conf'","'/etc/apache2/mods-available/status.conf'")."\n"); + copy($stdstatus,$sitestatus); + chmod(0644,$sitestatus); + } + } } print_and_log("\n"); } @@ -2189,7 +3293,7 @@ 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)) { @@ -2375,7 +3479,7 @@ wget http://install.loncapa.org/versions print &mt('LON-CAPA source files extracted.')."\n". &mt('It remains for you to execute the following commands:')." -cd /root/loncapa-N.N (N.N should correspond to a version number like '0.4') +cd /root/loncapa-X.Y.Z (X.Y.Z should correspond to a version number like '2.11.3') ./UPDATE ".&mt('If you have any trouble, please see [_1] and [_2]',