version 1.45.2.13, 2021/03/18 22:00:54
|
version 1.45.2.14, 2021/03/28 22:00:27
|
Line 469 sub check_required {
|
Line 469 sub check_required {
|
} |
} |
$mysqlon = &check_mysql_running($distro); |
$mysqlon = &check_mysql_running($distro); |
if ($mysqlon) { |
if ($mysqlon) { |
($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) = |
($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) = |
&check_mysql_setup($instdir,$dsn,$distro); |
&check_mysql_setup($instdir,$dsn,$distro); |
if ($mysqlsetup eq 'needsrestart') { |
if ($mysqlsetup eq 'needsrestart') { |
$mysqlrestart = ''; |
$mysqlrestart = ''; |
Line 1163 sub check_mysql_setup {
|
Line 1163 sub check_mysql_setup {
|
my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')"); |
my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')"); |
$sth->execute(); |
$sth->execute(); |
while (my $priv = $sth->fetchrow_array) { |
while (my $priv = $sth->fetchrow_array) { |
if ($priv =~ /unix_socket/) { |
if ($priv =~ /unix_socket/) { |
$mysql_unix_socket = 1; |
$mysql_unix_socket = 1; |
last; |
last; |
} |
} |
Line 1195 sub check_mysql_setup {
|
Line 1195 sub check_mysql_setup {
|
$mysql_has_wwwuser = &check_mysql_wwwuser($dbh); |
$mysql_has_wwwuser = &check_mysql_wwwuser($dbh); |
return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket); |
return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket); |
} |
} |
} |
} |
} elsif ($DBI::err =~ /1045/) { |
} elsif ($DBI::err =~ /1045/) { |
$has_pass = 1; |
$has_pass = 1; |
} elsif ($distro =~ /^ubuntu(\d+)$/) { |
} elsif ($distro =~ /^ubuntu(\d+)$/) { |
Line 1855 if ($callsub{'download'}) {
|
Line 1855 if ($callsub{'download'}) {
|
print "\n".&mt('Requested configuration complete.')."\n\n"; |
print "\n".&mt('Requested configuration complete.')."\n\n"; |
if ($have_tarball && !$updateshown) { |
if ($have_tarball && !$updateshown) { |
my ($lcdir) = ($sourcetarball =~ /^([\w.\-]+)\.tar.gz$/); |
my ($lcdir) = ($sourcetarball =~ /^([\w.\-]+)\.tar.gz$/); |
my ($apachename,$lc_uses_systemctl,$uses_sudo); |
my ($apachename,$lc_uses_systemctl,$uses_sudo); |
if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) { |
if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) { |
if (($1 eq 'suse') && ($2 < 10)) { |
if (($1 eq 'suse') && ($2 < 10)) { |
$apachename = 'apache'; |
$apachename = 'apache'; |