- Added support of Rabbit MQ

- Added possibility to specify tokens for repo.magento.com composer repository
- Fixed virtual hosts configuration to be compatible with Apache 2.4
- git is now installed by default

Author: Alexander Paliarush

install_environment.sh

@@ -84,3 +84,9 @@ if [ ${is_windows_host} -eq 1 ]; then
     chown -R vagrant:vagrant /var/www
     chmod -R 755 /var/www
 fi
+
+# Install RabbitMQ (is used by Enterprise edition)
+apt-get install -y rabbitmq-server
+rabbitmq-plugins enable rabbitmq_management
+invoke-rc.d rabbitmq-server stop
+invoke-rc.d rabbitmq-server start

install_magento.sh

@@ -39,17 +39,23 @@ for db_name in "${db_names[@]}"; do
     mysql -e "drop database if exists ${db_name}; create database ${db_name};"
 done
 
+# Install git
+apt-get install -y git
+
 # Install Magento application
 cd ${magento_dir}
-github_token="/vagrant/local.config/github.oauth.token"
-if [ -f ${github_token} ]; then
+composer_auth_json="/vagrant/local.config/composer/auth.json"
+if [ -f ${composer_auth_json} ]; then
     set +x
-    echo "Installing GitHub OAuth token from ${github_token}..."
-    composer config -g github-oauth.github.com `cat ${github_token}`
+    echo "Installing composer OAuth tokens from ${composer_auth_json}..."
     set -x
-    composer install
+    if [ ! -d /home/vagrant/.composer ] ; then
+      sudo -H -u vagrant bash -c 'mkdir /home/vagrant/.composer'
+    fi
+    cp ${composer_auth_json} /home/vagrant/.composer/auth.json
+    sudo -H -u vagrant bash -c 'composer install'
 else
-    composer install --prefer-source
+    sudo -H -u vagrant bash -c 'composer install --prefer-source'
 fi
 
 admin_frontame="admin"
@@ -69,6 +75,16 @@ install_cmd="./bin/magento setup:install \
     --admin-password=123123q \
     --cleanup-database \
     --use-rewrites=1"
+
+# Configure Rabbit MQ
+if [ -d "${magento_dir}/app/code/Magento/Amqp" ]; then
+    install_cmd="${install_cmd} \
+    --amqp-host=localhost \
+    --amqp-port=5672 \
+    --amqp-user=guest \
+    --amqp-password=guest"
+fi
+
 chmod +x bin/magento
 php ${install_cmd}
 

local.config/.gitignore

@@ -1,2 +1,5 @@
 /*
-!/.gitignore
+!/.gitignore
+!/composer
+/composer/*
+!/composer/auth.json.dist

local.config/composer/auth.json.dist

@@ -0,0 +1,11 @@
+{
+  "github-oauth": {
+    "github.com": "your-github-token"
+  },
+  "http-basic": {
+    "repo.magento.com": {
+      "username": "your-magento-repo-public-key",
+      "password": "your-magento-repo-secret-key"
+    }
+  }
+}

magento2.vhost.conf

@@ -4,8 +4,7 @@
     <Directory /var/www/magento2ce>
         Options Indexes FollowSymLinks
         AllowOverride All
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
     ErrorLog "${APACHE_LOG_DIR}/error.log"
     CustomLog "${APACHE_LOG_DIR}/access.log" common