--- doc/install/linux/install.pl	2021/03/16 01:03:04	1.71
+++ doc/install/linux/install.pl	2021/07/28 13:37:10	1.78
@@ -78,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.71 2021/03/16 01:03:04 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.78 2021/07/28 13:37:10 raeburn Exp $'."\n";
 }
 
 #
@@ -212,7 +212,7 @@ sub get_distro {
             $distro = 'rhes'.$1;
             $updatecmd = 'dnf install LONCAPA-prerequisites';
             $installnow = 'dnf -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
+        } elsif ($versionstring =~ /CentOS(?:| Linux| Stream) release (\d+)/) {
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
@@ -585,7 +585,7 @@ sub check_required {
      $nochgstd,$nochgint) = &chkapachessl($distro,$instdir,$hostname,$hostip);
     $recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
     ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing) 
-        = &need_download();
+        = &need_download($distro,$instdir);
     return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
             $mysqlrestart,\%recommended,$dbh,$has_pass,$mysql_unix_socket,
             $has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
@@ -616,6 +616,9 @@ sub check_mysql_running {
         if ($1 >= 19) {
             $mysqldaemon ='mariadb';
         }
+        if ($1 >= 34) {
+            $process = 'mariadb';
+        }
     } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
             $mysqldaemon ='mariadb';
@@ -886,13 +889,13 @@ sub uses_firewalld {
     }
     if ($checkfirewalld) {
         my ($loaded,$active);
-        if (open(PIPE,"systemctl status firewalld |")) {
+        if (open(PIPE,"systemctl status firewalld 2>/dev/null |")) {
             while (<PIPE>) {
                 chomp();
                 if (/^\s*Loaded:\s+(\w+)/) {
                     $loaded = $1;
                 }
-                if (/^\s*Active\s+(\w+)/) {
+                if (/^\s*Active:\s+(\w+)/) {
                     $active = $1;
                 }
             }
@@ -1440,12 +1443,12 @@ sub chksrvcs {
 }
 
 sub need_download {
+    my ($distro,$instdir) = @_;
     my $needs_download = 1;
     my ($production,$testing,$stdsizes) = &download_versionslist();
-    my ($rootdir,$localcurrent,$localtesting,%tarball,%localsize,%bymodtime,
+    my ($localcurrent,$localtesting,%tarball,%localsize,%bymodtime,
         %bysize,$filetouse,$downloadstatus);
-    $rootdir = '/root';
-    if (opendir(my $dir,"$rootdir")) {
+    if (opendir(my $dir,$instdir)) {
         my (@lcdownloads,$version);
         foreach my $file (readdir($dir)) {
             if ($file =~ /^loncapa\-([\w\-.]+)\.tar\.gz$/) {
@@ -1455,14 +1458,14 @@ sub need_download {
             }
             if (ref($stdsizes) eq 'HASH') {
                 if ($version eq 'current') {
-                    my @stats = stat("$rootdir/$file");
+                    my @stats = stat("$instdir/$file");
                     $localcurrent = $stats[7];
                     if ($localcurrent == $stdsizes->{$production}) {
                         $needs_download = 0;
                         $filetouse = $file;
                     }
                 } elsif ($version eq 'testing') {
-                    my @stats = stat("$rootdir/$file");
+                    my @stats = stat("$instdir/$file");
                     $localtesting = $stats[7];
                     if ($localtesting == $stdsizes->{$testing}) {
                         $needs_download = 0;
@@ -1476,7 +1479,7 @@ sub need_download {
         if ($needs_download) {
             if (@lcdownloads > 0) {
                 foreach my $version (@lcdownloads) {
-                    my @stats = stat("$rootdir/$tarball{$version}");
+                    my @stats = stat("$instdir/$tarball{$version}");
                     my $mtime = $stats[9];
                     $localsize{$version} = $stats[7];
                     if ($mtime) {
@@ -1509,21 +1512,21 @@ sub need_download {
                     my $newest = $sorted[0];
                     if (ref($bymodtime{$newest}) eq 'ARRAY') {
                         $downloadstatus = 
-                              "Latest LON-CAPA source download in $rootdir is: ".
+                              "Latest LON-CAPA source download in $instdir is: ".
                               join(',',@{$bymodtime{$newest}})." (downloaded ".
                               localtime($newest).")\n";
                     }
                 } else {
                     $downloadstatus = 
-                        "The $rootdir directory already contains the latest LON-CAPA version:".
+                        "The $instdir directory already contains the latest LON-CAPA version:".
                         "\n".$filetouse."\n"."which can be used for installation.\n";
                 }
             } else {
-                $downloadstatus = "The $rootdir directory does not appear to contain any downloaded LON-CAPA source code files which can be used for installation.\n";
+                $downloadstatus = "The $instdir directory does not appear to contain any downloaded LON-CAPA source code files which can be used for installation.\n";
             }
         }
     } else {
-        $downloadstatus = "Could not open $rootdir directory to look for existing downloads of LON-CAPA source code.\n";
+        $downloadstatus = "Could not open $instdir directory to look for existing downloads of LON-CAPA source code.\n";
     }
     return ($needs_download,$downloadstatus,$filetouse,$production,$testing);
 }
@@ -2003,26 +2006,41 @@ my $lctarball = 'loncapa-current.tar.gz'
 my $sourcetarball = $lctarball;
 if ($callsub{'download'}) {
     my ($production,$testing,$sizes) = &download_versionslist();
+    my $homedir = '/root';
+    if ($distro =~ /^ubuntu/) {
+        if ($instdir ne $homedir) {
+            ($homedir) = ($instdir =~ m{^(.*)/[^/]+$});
+        }
+    }
     if ($production && $testing) {
         if ($production ne $testing) {
             print &mt('Two recent LON-CAPA releases are available: ')."\n".
                   &mt('1.').' '.&mt('A production release - version: [_1].',$production)."\n".
                   &mt('2.').' '.&mt('A testing release - version: [_1].',$testing)."\n\n".
-                  &mt('Download the production release? ~[Y/n~]');
+                  &mt("After download, the tar.gz file will be extracted into $homedir")."\n\n".
+                  &mt("Download the production release into $instdir? ~[Y/n~]");
             if (&get_user_selection(1)) {
                 $sourcetarball = 'loncapa-'.$production.'.tar.gz';
+                print "$sourcetarball will be downloaded into $instdir\n";
             } else {
                 print "\n".&mt('Download the testing release? ~[Y/n~]');
                 if (&get_user_selection(1)) {
                     $sourcetarball = 'loncapa-'.$testing.'.tar.gz';
+                    print "$sourcetarball will be downloaded into $instdir\n";
+                } else {
+                    $callsub{'download'} = 0;
                 }
             }
         }
     } elsif ($production) {
         print &mt('The most recent LON-CAPA release is version: [_1].',$production)."\n".
-              &mt('Download the production release? ~[Y/n~]');
+              &mt("After download, the tar.gz file will be extracted into $homedir")."\n\n".
+              &mt("Download the production release into $instdir? ~[Y/n~]");
         if (&get_user_selection(1)) {
             $sourcetarball = 'loncapa-'.$production.'.tar.gz';
+            print "$sourcetarball will be downloaded into $instdir\n";
+        } else {
+            $callsub{'download'} = 0;
         }
     }
 } elsif ($filetouse ne '') {
@@ -2047,7 +2065,7 @@ if ($callsub{'pwauth'}) {
 if ($callsub{'mysql'}) {
     if ($dbh) {
         &setup_mysql($callsub{'mysqlperms'},$dbh,$has_pass,
-                     $mysql_unix_socket,$has_lcdb);
+                     $mysql_unix_socket,$has_lcdb,$distro);
     } else {
         print &mt('Unable to configure MySQL because access is denied.')."\n";
     }
@@ -2170,14 +2188,16 @@ 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 the like to allow access to ssh from outside, use the command[_1].',
-                  "firewall-cmd --permanent --zone=$zone --add-service=ssh")."\n";
+            print &mt('If you would like to allow access to ssh from outside, use the commands:')."\n".
+                  "firewall-cmd --permanent --zone=$zone --add-service=ssh\n".
+                  "firewall-cmd --reload\n";
         }
     } elsif ($distro =~ /^(suse|sles)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
@@ -2236,10 +2256,11 @@ if ($callsub{'download'}) {
     print &mt('LON-CAPA is available for download from: [_1]',
               'http://install.loncapa.org/')."\n";
     if (!-e '/etc/loncapa-release') {
-        &print_and_log(&mt('LON-CAPA is not yet installed on your system.'). 
-                       "\n\n". 
-                       &mt('You may retrieve the source for LON-CAPA by executing:')."\n".
-                       "wget http://install.loncapa.org/versions/$lctarball\n");
+        &print_and_log(&mt('LON-CAPA is not yet installed on your system.')."\n\n"; 
+        unless ($filetouse) {
+            &print_and_log(&mt('You may retrieve the source for LON-CAPA by executing:')."\n".
+                           "wget http://install.loncapa.org/versions/$lctarball\n");
+        }
     } else {
         my $currentversion;
         if (open(my $fh,"</etc/loncapa-release")) {
@@ -2268,6 +2289,9 @@ if ($callsub{'download'}) {
 print "\n".&mt('Requested configuration complete.')."\n\n";
 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)) {
@@ -2312,12 +2336,22 @@ if ($have_tarball && !$updateshown) {
             $apachestop = 'sudo '.$apachestop;
         }
         print &mt('If you are now ready to update LON-CAPA, enter the following commands:').
-              "\n\n$lcstop\n$apachestop\n";   
+              "\n\n$lcstop\n$apachestop\n";
     }
-    print "cd /root\n".
-          "tar zxf $sourcetarball\n".
-          "cd $lcdir\n".
-          "./UPDATE\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) {
@@ -2516,10 +2550,20 @@ sub kill_extra_services {
 }
 
 sub setup_mysql {
-    my ($setup_mysql_permissions,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb) = @_;
+    my ($setup_mysql_permissions,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,$distro) = @_;
     my @mysql_lc_commands;
     unless ($has_lcdb) {
-        push(@mysql_lc_commands,"CREATE DATABASE loncapa");
+        my $createcmd = 'CREATE DATABASE loncapa';
+        if ($distro =~ /^sles(\d+)/) {
+            if ($1 > 11) {
+                $createcmd .= ' CHARACTER SET utf8 COLLATE utf8_general_ci';
+            }
+        } elsif ($distro =~ /^ubuntu(\d+)/) {
+            if ($1 > 16) {
+                $createcmd .= ' CHARACTER SET latin1 COLLATE latin1_swedish_ci';
+            }
+        }
+        push(@mysql_lc_commands,$createcmd);
     }
     push(@mysql_lc_commands,"USE loncapa");
     push(@mysql_lc_commands,qq{
@@ -2565,7 +2609,8 @@ sub setup_mysql_permissions {
     if ($usescreate) {
         @mysql_commands = ("CREATE USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
     } elsif ($usesauth) {
-        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')");
+        @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 {
@@ -3620,31 +3665,47 @@ sub download_loncapa {
 	print_and_log("
 ------------------------------------------------------------------------
 
-".&mt('You seem to have a version of loncapa-current.tar.gz in [_1]',$instdir)."\n".
+".&mt('You seem to have a version of [_1] in [_2]',$lctarball,$instdir)."\n".
 &mt('This copy will be used and a new version will NOT be downloaded.')."\n".
 &mt('If you wish, you may download a new version by executing:')."
 
-wget http://install.loncapa.org/versions/loncapa-current.tar.gz
+wget http://install.loncapa.org/versions/$lctarball
 
 ------------------------------------------------------------------------
 ");
     }
 
     ##
-    ## untar loncapa.tar.gz
+    ## untar loncapa-X.Y.Z.tar.gz
     ##
     if ($have_tarball) {
+        my $homedir = '/root';
+        my ($targetdir,$chdircmd,$updatecmd);
+        if (($distro =~ /^ubuntu/) && ($instdir ne $homedir)) {
+            ($homedir) = ($instdir =~ m{^(.*)/[^/]+$});
+            $updatecmd = 'sudo ./UPDATE';
+        } else {
+            $updatecmd = './UPDATE';
+        }
         print_and_log(&mt('Extracting LON-CAPA source files')."\n");
-        writelog(`cd ~root; tar zxf $instdir/$lctarball`);
+        if (-e $homedir) {
+            writelog(`tar zxf $instdir/$lctarball --directory $homedir`);
+            $targetdir = $homedir;
+        } else {
+            writelog(`tar zxf $instdir/$lctarball`);
+            $targetdir = $instdir;
+        }
+        if ($lctarball =~ /^loncapa\-(\d+\.\d+\.\d+(?:|[^.]+))\.tar\.gz$/) {
+            $chdircmd = "cd $targetdir/loncapa-".$1;
+        } else {
+            $chdircmd = "cd $targetdir/loncapa-X.Y.Z  (X.Y.Z should correspond to a version number like '2.11.3')";
+        }
         print_and_log("\n");
         print &mt('LON-CAPA source files extracted.')."\n".
-              &mt('It remains for you to execute the following commands:')."
-
-cd /root/loncapa-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]',
-      'http://install.loncapa.org/','http://help.loncapa.org/')."\n";
+              &mt('It remains for you to execute the following commands:').
+              "\n$chdircmd\n$updatecmd\n".
+              &mt('If you have any trouble, please see [_1] and [_2]',
+                  'http://install.loncapa.org/','http://help.loncapa.org/')."\n";
         $updateshown = 1;
     }
     return ($have_tarball,$updateshown);