[v1.3.4] resolve redis config issue and move php version settings

Author: Benjamin Calef

provision/110-magento-app.sh

@@ -27,20 +27,20 @@ if [ "$PROJECT_SOURCE" == "composer" ]; then
 	# Install from magento
 	sudo -u vagrant composer create-project --no-interaction --no-install --no-progress \
 		--repository=https://repo.magento.com/ magento/project-"$PROJECT_EDITION"-edition="$PROJECT_VERSION" "$PROJECT_NAME" -d "$DIRECTORY_BUILD"
-		# Install sample data
-    if [ "$PROJECT_SAMPLE" == "true" ]; then
-      sudo -u vagrant composer require -d "$PROJECT_BUILD" \
-      magento/module-bundle-sample-data magento/module-widget-sample-data \
-      magento/module-theme-sample-data magento/module-catalog-sample-data \
-      magento/module-customer-sample-data magento/module-cms-sample-data \
-      magento/module-catalog-rule-sample-data magento/module-sales-rule-sample-data \
-      magento/module-review-sample-data magento/module-tax-sample-data \
-      magento/module-sales-sample-data magento/module-grouped-product-sample-data \
-      magento/module-downloadable-sample-data magento/module-msrp-sample-data \
-      magento/module-configurable-sample-data magento/module-product-links-sample-data \
-      magento/module-wishlist-sample-data magento/module-swatches-sample-data \
-      magento/sample-data-media magento/module-offline-shipping-sample-data
-    fi
+  # Install sample data
+	if [ "$PROJECT_SAMPLE" == "true" ]; then
+		sudo -u vagrant composer require -d "$PROJECT_BUILD" \
+    magento/module-bundle-sample-data magento/module-widget-sample-data \
+    magento/module-theme-sample-data magento/module-catalog-sample-data \
+    magento/module-customer-sample-data magento/module-cms-sample-data \
+    magento/module-catalog-rule-sample-data magento/module-sales-rule-sample-data \
+    magento/module-review-sample-data magento/module-tax-sample-data \
+    magento/module-sales-sample-data magento/module-grouped-product-sample-data \
+    magento/module-downloadable-sample-data magento/module-msrp-sample-data \
+    magento/module-configurable-sample-data magento/module-product-links-sample-data \
+    magento/module-wishlist-sample-data magento/module-swatches-sample-data \
+    magento/sample-data-media magento/module-offline-shipping-sample-data
+  fi
 else
 	# Install from git
 	sudo -u vagrant git clone "$PROJECT_REPOSITORY" "$PROJECT_BUILD"
@@ -49,7 +49,6 @@ fi
 
 # Composer install
 sudo -u vagrant composer install -d "$PROJECT_BUILD" --no-progress --no-interaction --no-suggest
-chmod +x "$PROJECT_PATH"/bin/magento
 
 # Rsync directory
 if [ "$PROJECT_BUILD" != "$PROJECT_PATH" ]; then
@@ -66,6 +65,7 @@ if [ "$PROJECT_MOUNT" != "nfs" ] || [ "$PROJECT_MOUNT_PATH" == "app" ]; then
 fi
 
 # Run install
+chmod +x "$PROJECT_PATH"/bin/magento
 sudo -u vagrant "$PROJECT_PATH"/bin/magento setup:uninstall -n -q
 sudo -u vagrant "$PROJECT_PATH"/bin/magento setup:install \
 --base-url="http://${PROJECT_URL}/" \