From 7ec7ae77eecc2bdb65081b0e77d3c318328857c5 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 22 Dec 2014 14:05:06 +0100
Subject: [PATCH] Update trusty64 bootstrap

---
 lamp-trusty64/bootstrap.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lamp-trusty64/bootstrap.sh b/lamp-trusty64/bootstrap.sh
index e2949bc..fba27f4 100644
--- a/lamp-trusty64/bootstrap.sh
+++ b/lamp-trusty64/bootstrap.sh
@@ -2,7 +2,6 @@
 
 sudo apt-get update
 sudo apt-get -y upgrade
-sudo apt-get -y install htop unzip
 
 # Installation Wkhtmltopdf
 if [ ! -f /usr/local/bin/wkhtmltopdf ]
@@ -15,7 +14,7 @@ fi
 if [ ! -f /usr/bin/php5 ]
 then
     sudo apt-get update
-    sudo apt-get -y install apache2 mysql-client-5.5 php5 php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd php5-xdebug
+    sudo apt-get -y install htop unzip apache2 mysql-client-5.5 php5 php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd php5-xdebug
     sudo a2enmod autoindex deflate expires headers rewrite
 fi
 
@@ -33,9 +32,7 @@ then
     sudo apt-get -y --allow-unauthenticated install mariadb-server
     #sudo sed -i -e 's/datadir = \/var\/lib\/mysql/datadir = \/home\/vhosts\/mysql/g' /etc/mysql/my.cnf
     sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
-    sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf
-    sudo service mysql restart
-    mysql -uroot -p$MYSQL_PASS < /vagrant/data/Apps/phpmyadmin.sql
+    sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf       
     sudo touch /etc/mysql/vagrant
 fi
 
@@ -43,11 +40,13 @@ fi
 PHPMYADMIN_VERSION='4.3.1'
 if [ ! -d "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages" ]
 then
-    if [ -f "/vagrant/data/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages.zip" ]
+    if [ -f "/vagrant/data/Apps/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages.zip" ]
     then
-    	unzip "/vagrant/data/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages.zip" -d /home/vhosts/
-    	mysql -uroot -p$MYSQL_PASS < "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/examples/create_tables.sql"
-    	cp /vagrant/data/Apps/config.inc.php "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/"
+    	unzip "/vagrant/data/Apps/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages.zip" -d /home/vhosts/
+    	mysql -hlocalhost -uroot -p$MYSQL_PASS < /vagrant/data/Apps/phpmyadmin.sql
+    	mysql -hlocalhost -uroot -p$MYSQL_PASS < /home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/examples/create_tables.sql
+    	sudo service mysql restart 
+    	cp /vagrant/data/Apps/config.inc.php "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/"	
 	fi
 fi