--- tuning-primer.sh 2013-01-29 11:49:54.000000000 +0100 +++ tuning-primer_mod.sh 2013-01-29 11:49:24.000000000 +0100 @@ -186,8 +186,10 @@ check_for_socket () { if [ -z "$socket" ] ; then # Use ~/my.cnf version - if [ -f ~/.my.cnf ] ; then + if [ -r ~/.my.cnf ] ; then cnf_socket=$(grep ^socket ~/.my.cnf | awk -F \= '{ print $2 }' | head -1) + elif [ -r "/etc/mysql/debian.cnf" ] ; then + cnf_socket=$(grep ^socket /etc/mysql/debian.cnf | awk -F \= '{ print $2 }' | head -1) fi if [ -S "$cnf_socket" ] ; then socket=$cnf_socket @@ -219,9 +221,12 @@ ## -- Check for the existance of plesk and login using it's credentials -- ## - if [ -f /etc/psa/.psa.shadow ] ; then + if [ -r /etc/psa/.psa.shadow ] ; then mysql="mysql -S $socket -u admin -p$(cat /etc/psa/.psa.shadow)" mysqladmin="mysqladmin -S $socket -u admin -p$(cat /etc/psa/.psa.shadow)" + elif [ -r "/etc/mysql/debian.cnf" ] ; then + mysql="mysql --defaults-file=/etc/mysql/debian.cnf" + mysqladmin="mysqladmin --defaults-file=/etc/mysql/debian.cnf" else mysql="mysql" mysqladmin="mysqladmin"