Merge branch 'release/1.1.0'

Author: IvanChepurnyi

README.md

@@ -1,2 +1,67 @@
-# fast-hypernode
+# Fast Hypernode Vagrant Box
+
+**The fastest Magento Vagrant VM**
 Fast Byte Hypernode Box (Uses nfs_guest plugin for file shares)
+
+Based on images from https://github.com/byteinternet/hypernode-vagrant
+
+# Installation
+
+Installation is possible via composer:
+
+```bash
+composer create-project --keep-vcs ecomdev/fast-hypernode
+```
+
+
+
+# Required Vagrant plugins
+
+* vagrant-hostmanager 
+* vagrant-auto_network
+* vagrant-nfs_guest
+
+
+# Usage
+
+1. Copy config.rb.dst to config.rb
+2. Edit it to reflect your project settings
+```ruby
+name 'your-project-name'
+hostname name + '.box' # will be your main url http://your-project-name.box/
+domains %w(www.your-project-name-additional.box) # additional domain names separated by space
+profiler true # Add tideways-profiler ?
+developer true # Enable development mode?
+directory 'server' # Directory into which NFS share will be mounted on your host
+```
+
+# Configuration Options
+
+* `name` - name of your node
+* `hostname` - default project hostname
+* `domains` - list of additional domain names for your project 
+* `varnish` - enable or disable varnish for your project (default: `false`)
+* `profiler` - enable or disable tideways-profiler (default: `false`)
+* `developer` - enable or disable developer mode in Magento (default: `false`)
+* `magento2` - Magento 2.0 installment? (default: `false`)
+* `install` - Shall Magento be installed? (default: `false`, only Magento 2.0 installation supported)
+* `shell` - Install FishShell? (default: `false`)
+* `php7` - PHP7 instead of PHP5? (default: `false`)
+* `cpu` - number of CPUs to dedicate to your VM (default: `1`)
+* `memory` - memory in MB to dedicate to your VM (default: `1024`)
+* `user` - User name for nfs share permissions (default: `app`)
+* `group` - Group name for nfs share permissions (default: `app`)
+* `uid` - User ID of your host to be mapped to linux VM (default: `Process.euid`)
+* `gid` - Group ID of your host to be mapped to linux VM (default: `Process.egid`)
+* `directory` - Directory to be used as mount on host machine (default: `server`)
+* `network` - Network mast for automatical network assignment to VM (default: `33.33.33.0/24`)
+
+# Adding custom shell provisioners
+
+You can easily add more provision shell scripts from configuration file (config.rb):
+```ruby
+add_shell 'some-custom-shell-script.sh'
+
+# Will provision only if PHP7 flag is turned on
+add_shell 'some-custom-script-for-php7.sh', :php7  
+```

Vagrantfile

@@ -92,7 +92,9 @@ Vagrant.configure("2") do |config|
         VAGRANT_USER: box_config.get(:user),
         VAGRANT_GROUP: box_config.get(:group),
         VAGRANT_HOSTNAME: box_config.get(:hostname),
-        VAGRANT_FPM_SERVICE: box_config.flag?(:php7) ? 'php7.0-fpm' : 'php5-fpm'
+        VAGRANT_FPM_SERVICE: box_config.flag?(:php7) ? 'php7.0-fpm' : 'php5-fpm',
+        VAGRNAT_PHP_ETC_DIR: box_config.flag?(:php7) ? '/etc/php/7.0/' : '/etc/php5/',
+        VAGRNAT_PHP_PACKAGE_PREFIX: box_config.flag?(:php7) ? 'php7.0' : 'php5'
     }
   end
 

vagrant/provisioning/hypernode.sh

@@ -31,6 +31,8 @@ fi
 /usr/local/bin/n98-magerun -q self-update || true
 /usr/local/bin/n98-magerun2 -q self-update || true
 
+usermod -a -G admin app
+
 # Remove mysql user from cgroup limitation, as hardcoded ones during deployment of hypernode box swap all stuff out
 tee /etc/cgrules.conf <<"CONFIG"
 solr            memory          limited

vagrant/provisioning/profiler.sh

@@ -6,7 +6,7 @@ AS_USER="sudo -u ${VAGRANT_USER}"
 CUR_DIR=$(pwd)
 HOME_DIR=$(getent passwd ${VAGRANT_USER} | cut -d ':' -f6)
 
-apt-get install php-pear php5-dev graphviz build-essential -y -q
+apt-get install ${VAGRNAT_PHP_PACKAGE_PREFIX}-dev graphviz build-essential -y -q
 
 [ -d $HOME_DIR/tideways-profiler ] || $AS_USER mkdir $HOME_DIR/tideways-profiler
 [ -d $HOME_DIR/tideways-profiler/.git ] || $AS_USER git clone https://github.com/tideways/php-profiler-extension.git $HOME_DIR/tideways-profiler
@@ -36,13 +36,13 @@ if (!empty($_SERVER['PHP_PROFILE']) || !empty($_COOKIE['PHP_PROFILE'])) {
 }
 PHPFILE1
 
-tee /etc/php5/fpm/conf.d/tideways.ini <<PHPINI
+tee ${VAGRNAT_PHP_ETC_DIR}/fpm/conf.d/tideways.ini <<PHPINI
 extension=tideways.so
 auto_prepend_file=$HOME_DIR/xhprof/prepend.php
 tideways.auto_prepend_library=0
 PHPINI
 
-cp /etc/php5/fpm/conf.d/tideways.ini /etc/php5/cli/conf.d/tideways.ini
+cp ${VAGRNAT_PHP_ETC_DIR}/fpm/conf.d/tideways.ini ${VAGRNAT_PHP_ETC_DIR}/cli/conf.d/tideways.ini
 
 if [ ! -L /data/web/staging ]
 then