update comments and logging messages

This commit is contained in:
Markus Köberl 2011-04-21 14:36:10 +02:00
parent 2e347611ff
commit 27f1454b0e

View file

@ -293,15 +293,18 @@ sub mysql_setup {
exit 0;
}
} elsif ( -r "/etc/mysql/debian.cnf" and $doremote == 0 ){
# It's a debian system, use the maintenance account
# We have a debian maintenance account, use it
$mysqllogin = "--defaults-file=/etc/mysql/debian.cnf";
my $loginstatus = `mysqladmin $mysqllogin ping 2>&1`;
unless ($loginstatus =~ /mysqld is alive/) {
if ($loginstatus =~ /mysqld is alive/) {
goodprint "Logged in using credentials from debian maintenance account.\n";
return 1;
} else {
badprint "Attempted to use login credentials from debian maintenance account, but they failed.\n";
exit 0;
}
} else {
# It's not Plesk, we should try a login
# It's not Plesk or debian, we should try a login
my $loginstatus = `mysqladmin $remotestring ping 2>&1`;
if ($loginstatus =~ /mysqld is alive/) {
# Login went just fine