#107 Fix percona-server-5.6

EasyEngine · Sep 17, 2014 · d9f5114 · d9f5114
1 parent 3b92fd8
commit d9f5114
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/modules/site/ee_mod_site_cd.sh b/src/modules/site/ee_mod_site_cd.sh
@@ -1,4 +1,4 @@
-#CD to Webroot
+# Change directory to website root
 
 function ee_site_cd()
 {

diff --git a/src/modules/stack/install/ee_mod_install_mysql.sh b/src/modules/stack/install/ee_mod_install_mysql.sh
@@ -13,16 +13,16 @@ ee_mod_install_mysql()
 	if [ -n "$EE_PACKAGE_NAME" ]; then
 
 		# Setting up MySQL password
-		debconf-set-selections <<< "mysql-server mysql-server/root_password password $ee_random"
-		debconf-set-selections <<< "mysql-server mysql-server/root_password_again password $ee_random"
+		debconf-set-selections <<< "percona-server-server-5.6 percona-server-server/root_password password $ee_random"
+		debconf-set-selections <<< "percona-server-server-5.6 percona-server-server/root_password_again password $ee_random"
 
 		# Generate ~/.my.cnf
 		echo -e "[client]\nuser=root\npassword=$ee_random" > ~/.my.cnf
 
 	fi
 
 	ee_lib_echo "Installing MySQL, please Wait..."
-	$EE_APT_GET install mysql-server mysqltuner percona-toolkit \
+	$EE_APT_GET install percona-server-server-5.6 mysqltuner percona-toolkit \
 	|| ee_lib_error "Unable to install MySQL, exit status = " $?
 
 	# Download tuning-primer.sh

diff --git a/src/modules/stack/install/ee_mod_repo_mysql.sh b/src/modules/stack/install/ee_mod_repo_mysql.sh
@@ -8,7 +8,7 @@ function ee_mod_repo_mysql()
 	|| ee_lib_error "Unable to add Percona repository, exit status = " $?
 
 	# Fetch and install Percona GnuPG key
-	gpg --keyserver  hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A && \
-	gpg -a --export CD2EFD2A | sudo apt-key add - \
+	gpg --keyserver  hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A &>> $EE_COMMAND_LOG && \
+	gpg -a --export CD2EFD2A | sudo apt-key add - &>> $EE_COMMAND_LOG \
 	|| ee_lib_error "Unable to add Percona GnuPG key, exit status = " $?
 }