Merge branch 'release/1.0.2'

Author: IvanChepurnyi

vagrant/provisioning/magento2-install.sh

@@ -7,6 +7,9 @@ HOME_DIR=$(getent passwd ${VAGRANT_USER} | cut -d ':' -f6)
 
 cd ${HOME_DIR}/magento2
 
+MYSQLPASSWORD=$(awk -F "=" '/password/ {print $2}' ${HOME_DIR}/.my.cnf | sed -e 's/^[ \t]*//')
+mysql -u app -p${MYSQLPASSWORD} -e "create database magento2"
+
 echo "Downloading Magento 2..."
 
 [ -d ${HOME_DIR}/magento2/bin ] || $AS_USER wget -qO- https://magento.mirror.hypernode.com/releases/magento2-latest.tar.gz | $AS_USER tar xfz -
@@ -18,4 +21,4 @@ echo "Installing ..."
 $AS_USER ln -fs ../magento2/pub/* ../public
 $AS_USER bin/magento setup:static-content:deploy
 
-echo "Static content deployed ..."
+echo "Static content deployed ..."

vagrant/provisioning/magento2.sh

@@ -7,8 +7,5 @@ HOME_DIR=$(getent passwd ${VAGRANT_USER} | cut -d ':' -f6)
 
 $AS_USER touch ${HOME_DIR}/nginx/magento2.flag
 
-MYSQLPASSWORD=$(awk -F "=" '/password/ {print $2}' ${HOME_DIR}/.my.cnf | sed -e 's/^[ \t]*//')
-mysql -u app -p${MYSQLPASSWORD} -e "create database magento2"
-
 [ -d ${HOME_DIR}/magento2 ] || $AS_USER mkdir ${HOME_DIR}/magento2
 [ -d ${HOME_DIR}/public ] || $AS_USER mkdir ${HOME_DIR}/public