--- doc/install/linux/install.pl	2020/11/11 20:58:37	1.68
+++ doc/install/linux/install.pl	2021/03/16 01:03:04	1.71
@@ -29,6 +29,7 @@ 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));
@@ -77,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.68 2020/11/11 20:58:37 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.71 2021/03/16 01:03:04 raeburn Exp $'."\n";
 }
 
 #
@@ -521,7 +522,7 @@ sub check_required {
     }
     my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,
         %recommended,$downloadstatus,$filetouse,$production,$testing,$apachefw,
-        $tostop,$uses_systemctl,$hostname,$hostip);
+        $tostop,$uses_systemctl,$mysql_has_wwwuser,$hostname,$hostip);
     my $wwwuid = &uid_of_www();
     my $wwwgid = getgrnam('www');
     if (($wwwuid eq '') || ($wwwgid eq '')) {
@@ -551,9 +552,8 @@ sub check_required {
     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();
         ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) =
-            &check_mysql_setup($instdir,$dsn,$distro,$mysql_has_wwwuser);
+            &check_mysql_setup($instdir,$dsn,$distro);
         if ($mysqlsetup eq 'needsrestart') {
             $mysqlrestart = '';
             if ($distro eq 'ubuntu') {
@@ -983,10 +983,10 @@ sub chkapache {
         } else {
             my ($configfile,$sitefile);
             if (($distname eq 'ubuntu') && ($version > 12)) {
-                $sitefile = '/etc/apache2/sites-available/loncapa';
-                $configfile = "/etc/apache2/conf-available/loncapa";
+                $sitefile = '/etc/apache2/sites-available/loncapa.conf';
+                $configfile = '/etc/apache2/conf-available/loncapa.conf';
             } 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 |")) {
@@ -1529,8 +1529,8 @@ sub need_download {
 }
 
 sub check_mysql_setup {
-    my ($instdir,$dsn,$distro,$mysql_has_wwwuser) = @_;
-    my ($mysqlsetup,$has_pass,$mysql_unix_socket);
+    my ($instdir,$dsn,$distro) = @_;
+    my ($mysqlsetup,$has_pass,$mysql_unix_socket,$mysql_has_wwwuser);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
     my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
     if (($mysqlname =~ /^MariaDB/i) && ($mysqlversion >= 10.4)) {
@@ -1547,16 +1547,30 @@ sub check_mysql_setup {
             if ($mysql_unix_socket) {
                 print_and_log(&mt('MariaDB using unix_socket for root access from localhost.')."\n");
                 $mysqlsetup = 'rootok';
-                $mysql_unix_socket = 1;
-                unless ($mysql_has_wwwuser) {
-                    $mysql_has_wwwuser = &check_mysql_wwwuser();
-                }
+                $mysql_has_wwwuser = &check_mysql_wwwuser($dbh);
                 return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket);
             }
         }
     }
     if ($dbh) {
-        $mysqlsetup = 'noroot'; 
+        $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+)$/) {
@@ -1569,16 +1583,15 @@ 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);
             }
         }
@@ -1590,6 +1603,7 @@ 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");
@@ -1601,27 +1615,35 @@ 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;
-    my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
-                            {PrintError => +0}) || return;
-    if ($dbhn) {
-        $mysql_wwwuser = 1;
-        $dbhn->disconnect;
+    if ($dbh) {
+        $mysql_wwwuser = $dbh->selectrow_array("SELECT COUNT(User) FROM mysql.user WHERE (User = 'www' AND Host ='localhost')");
+    } else {
+        my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
+                                {PrintError => +0}) || return;
+        if ($dbhn) {
+            $mysql_wwwuser = 1;
+            $dbhn->disconnect;
+        }
     }
     return $mysql_wwwuser;
 }
@@ -2244,32 +2266,73 @@ if ($callsub{'download'}) {
 }
 
 print "\n".&mt('Requested configuration complete.')."\n\n";
-my $apachename;
 if ($have_tarball && !$updateshown) {
     my ($lcdir) = ($sourcetarball =~ /^([\w.\-]+)\.tar.gz$/);
+    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)(\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 {
-        print &mt('If you are now ready to update LON-CAPA, enter the following commands:')."\n\n".
-                  "/etc/init.d/loncontrol stop\n";
-        if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) {
-            if (($1 eq 'suse') && ($2 < 10)) {
-                $apachename = 'apache';
-            } else {
-                $apachename = 'apache2';
-            }
-        } else {
-            $apachename = 'httpd';
+        my $lcstop = '/etc/init.d/loncontrol stop';
+        if ($lc_uses_systemctl) {
+            $lcstop = 'systemctl stop loncontrol';
+        }
+        my $apachestop = "/etc/init.d/$apachename stop";
+        if ($uses_systemctl) {
+            $apachestop = "systemctl stop $apachename";
+        }
+        if ($uses_sudo) {
+            $lcstop = 'sudo '.$lcstop;
+            $apachestop = 'sudo '.$apachestop;
         }
-        print "/etc/init.d/$apachename stop\n";
+        print &mt('If you are now ready to update LON-CAPA, enter the following commands:').
+              "\n\n$lcstop\n$apachestop\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";
+        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 "$apachestart\n";
     }
 }
 exit;
@@ -3193,6 +3256,7 @@ 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;
@@ -3212,11 +3276,39 @@ sub copy_apache2_debconf {
                 close(PIPE);
                 chomp($diffres);
                 if ($diffres) {
-                    copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
+                    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;
                         }
@@ -3226,12 +3318,14 @@ sub copy_apache2_debconf {
         }
         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");
+            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);
             }
-            symlink("$apache2_conf_available_dir/loncapa","$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")) {
@@ -3240,11 +3334,36 @@ sub copy_apache2_debconf {
                 close(PIPE);
                 chomp($diffres);
                 if ($diffres) {
-                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
+                    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;
                         }
@@ -3253,10 +3372,21 @@ sub copy_apache2_debconf {
             }
         }
         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");
+            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")) {