Merge pull request #123 from ByteInternet/inline-ensure-varnish-is-running

inline plugin to ensure varnish is running

Author: vdloo

Vagrantfile

@@ -18,6 +18,7 @@ SETTINGS_FILE = "local.yml"
 # load the settingsfile or if it does not exist yet a hash where every attribute two levels deep is nil
 settings = YAML.load_file(SETTINGS_FILE) rescue Hash.new(Hash.new(nil))
 
+require_relative 'vagrant/plugins/inline/ensure-varnish.rb'
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # run hypernode-vagrant configuration wizard if needed during 'vagrant up'
   config.hypconfigmgmt.enabled = true  

vagrant/plugins/inline/ensure-varnish.rb

@@ -0,0 +1,36 @@
+require "vagrant"
+
+module VagrantPlugins
+  module VagrantInlinePlugin
+    class Command
+      def initialize(app, env)
+        @app = app
+        @env = env
+      end
+
+      def call(env)
+        env[:machine].communicate.sudo(
+          "ps -ef | grep -v \"grep\" | grep varnishd -q || (service varnish start && sleep 1)",
+          {:error_check => false}
+        ) do |type, data|
+          output = data.to_s.strip()
+          if output.include? "Starting HTTP accelerator varnishd"
+            env[:ui].info("Started Varnish")
+          end
+        end
+        @app.call(env)
+      end
+    end
+  end
+
+  class Plugin < Vagrant.plugin("2")
+    name "Ensure varnish is started as soon as the instance is started"
+
+    action_hook(:VagrantInlinePlugin) do |hook|
+      hook.after(
+        Vagrant::Action::Builtin::WaitForCommunicator, 
+        VagrantInlinePlugin::Command
+      )
+    end
+  end
+end

vagrant/provisioning/hypernode.sh

@@ -43,7 +43,7 @@ EOF
 
 # Restart varnish if the hostname changed
 if [ ! -d "/var/lib/varnish/$HOSTNAME" ]; then
-    service varnish restart
+    service varnish restart && sleep 1
 fi
 
 rm -rf /etc/cron.d/hypernode-fpm-monitor
@@ -65,10 +65,6 @@ else
     sudo -u $user rm -f /data/web/nginx/magento2.flag
 fi
 
-# ensure varnish is running. in lxc vagrant boxes for some reason the varnish init script in /etc/init.d doesn't bring up the service on boot
-# todo: find out why varnish isn't always started on startup on lxc instances
-ps -ef | grep -v "grep" | grep varnishd -q || (service varnish start && sleep 1)
-
 # if the webroot is empty, place our default index.php which shows the settings
 if ! find /data/web/public/ -mindepth 1 -name '*.php' -name '*.html' | read; then
     cp /vagrant/vagrant/resources/*.{php,js,css} /data/web/public/
@@ -132,7 +128,7 @@ if $xdebug_enabled; then
     echo "this article: https://support.hypernode.com/knowledgebase/install-xdebug-hypernode-vagrant/"
 fi
 
-if ! $varnish_enabled; then
+if ! $varnish_enabled; then 
     su $user -c "echo -e 'vcl 4.0;\nbackend default {\n .host = \"127.0.0.1\";\n .port= \"8080\";\n}\nsub vcl_recv {\n return(pass);\n}' > /data/web/disabled_caching.vcl"
     varnishadm vcl.list | grep -q nocache || varnishadm vcl.load nocache /data/web/disabled_caching.vcl
     varnishadm vcl.use nocache