Browse Source

Fixed percona-mysql remove/purge and also log mysqladmin ping messages

old-stable
Mitesh Shah 10 years ago
parent
commit
09cb2fab47
  1. 2
      bin/easyengine
  2. 2
      bin/update
  3. 6
      src/modules/stack/install/ee_mod_install_mysql.sh
  4. 6
      src/modules/stack/remove/ee_mod_remove_mysql.sh
  5. 2
      src/vendor/ee_ven_install_utils.sh

2
bin/easyengine

@ -140,7 +140,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
# Check required Packages are installed or not
dpkg --get-selections | grep -v deinstall | grep nginx > /dev/null \
&& dpkg --get-selections | grep -v deinstall | grep php5-fpm > /dev/null \
&& mysqladmin ping &> /dev/null \
&& mysqladmin ping &>> $EE_COMMAND_LOG \
&& dpkg --get-selections | grep -v deinstall | grep postfix > /dev/null
if [ $? -ne 0 ];then
ee_lib_error "Failed to find NGINX PHP MySQL Postfix, exit status=" 1

2
bin/update

@ -325,7 +325,7 @@ if [[ $EE_CURRENT_VERSION < $EE_LATEST_VERSION ]]; then
|| ee_lib_error "Unable to add xdebug settings for debug pool, exit status = " $?
fi
dpkg --get-selections | grep -v deinstall | grep mysql-server &>> $EE_UPDATE_LOG
mysqladmin ping &> /dev/null &>> $EE_UPDATE_LOG
if [ $? -eq 0 ]; then
ee_lib_echo "Installing percona-toolkit package, please wait..."
apt-get -y install percona-toolkit \

6
src/modules/stack/install/ee_mod_install_mysql.sh

@ -5,10 +5,10 @@ ee_mod_install_mysql()
# Random characters
local ee_random=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)
# Check MySQL is installed or not
ee_lib_package_check mysql-server
# Check Percona MySQL is installed or not
ee_lib_package_check percona-server-server-5.6
# If MySQL is not installed
# If Percona MySQL is not installed
# Then set random MySQL password for root user
if [ -n "$EE_PACKAGE_NAME" ]; then

6
src/modules/stack/remove/ee_mod_remove_mysql.sh

@ -2,9 +2,9 @@
function ee_mod_remove_mysql()
{
ee_lib_echo "$EE_SECOND MySQL package, please wait..."
$EE_APT_GET $EE_SECOND mysql-server mysqltuner percona-toolkit \
|| ee_lib_error "Unable to $EE_SECOND MySQL, exit status = " $?
ee_lib_echo "$EE_SECOND Percona MySQL package, please wait..."
$EE_APT_GET $EE_SECOND percona-server-server-5.6 mysqltuner percona-toolkit \
|| ee_lib_error "Unable to $EE_SECOND Percona MySQL, exit status = " $?
# Remove tuning-primer.sh
rm -f /usr/local/bin/tuning-primer.sh

2
src/vendor/ee_ven_install_utils.sh

@ -70,7 +70,7 @@ function ee_ven_install_utils()
# phpinfo()
echo -e "<?php \n\t phpinfo(); \n?>" &>> /var/www/22222/htdocs/php/info.php
fi
mysqladmin ping &> /dev/null
mysqladmin ping &>> $EE_COMMAND_LOG
if [ $? -eq 0 ]; then
# Setup Anemometer
if [ ! -d /var/www/22222/htdocs/db/anemometer ]; then

Loading…
Cancel
Save