Merge branch 'release/1.2.4'

Author: IvanChepurnyi

Vagrantfile

@@ -49,11 +49,10 @@ Vagrant.configure("2") do |config|
   # Prepare configuration and setup shell scripts for it
   current_file = Pathname.new(__FILE__)
   box_config = VagrantApp::Config.new
-
   # Base hypernode provisioner
   box_config.shell_add('hypernode.sh')
     .shell_add('composer.sh') # Composer installer
-    .shell_add('nfs.sh') # NFS server modifications to have proper permissions
+    .shell_add('nfs.sh', :unison, true) # NFS server modifications to have proper permissions
     .shell_add('developer.sh', :developer) # Developer mode setting, depends on :developer configuration flag
     .shell_add('profiler.sh', :profiler) # Profiler installer, depends on :profiler configuration flag
     .shell_add('disable-varnish.sh', :varnish, true) # Varnish disabler, depends on :varnish inverted flag

vagrant/inline/config.rb

@@ -78,7 +78,7 @@ def shell_add(script, flags = nil, inverse = false)
 
     def shell_list
       scripts = @shell.select do |info|
-        flag?(info[:flags])
+        flag?(info[:flags], info[:inverse])
       end
       scripts.collect do |info|
         info[:file]

vagrant/provisioning/nfs.sh

@@ -3,10 +3,12 @@
 set -e
 
 echo "Changing user id"
+IS_HHVM_RUNNING=$(service hhvm status | grep "stop" > /dev/null && echo "" || echo "1")
 service nginx stop
 service ${VAGRANT_FPM_SERVICE} stop
-service hhvm stop
+[ $IS_HHVM_RUNNING ] && service hhvm stop
 usermod -u ${VAGRANT_UID} ${VAGRANT_USER}
 service nginx start
 service ${VAGRANT_FPM_SERVICE} start
-service hhvm start
+[ $IS_HHVM_RUNNING ] && service hhvm start
+true # Return true at the end of the stack