Varnish Support

- Changed the way the command works.
- m-varnish command now accounts for backwards compatibility.
- m-varnish command now works on guest.

Author: Hayder Sharhan

README.md

@@ -238,6 +238,8 @@ Running vagrant reload will apply your preference. Or by using m-varnish script.
 It will use default file etc/magento2_default_varnish.vcl.dist generated from a Magento instance.
 Varnish Version: 3.0.5
 
+Note: command m-varnish with arguments disable or enable is also available in guest or host to enable or disable varnish without reloading machine.
+
 ### Multiple Magento instances
 
 To install several Magento instances based on different code bases, just follow [Installation steps](#installation-steps) to initialize project in another directory on the host.

m-varnish

@@ -1,41 +1,5 @@
 #!/usr/bin/env bash
 
-# Get args
-while getopts 'fh:c:' flag; do
-  case "${flag}" in
-    h) help=1 ;;
-    c) command=$OPTARG ;;
-    f) force_restart_services=1 ;;
-    *) help=1 ;;
-  esac
-done
-
-if [[ $help ]]; then
-    echo "Usage: ./m-varnish -c enable/disable (-f to force restart services)"
-    exit 0
-fi
-
-# Check if user created config.yaml file
-if [[ ! -f ./etc/config.yaml ]]; then
-    echo "Please make sure you have create a config.yaml file copy from etc/config.yaml.dist"
-    exit 0
-fi
-
-if [[ $command == "enable" ]]; then
-    sed -ie "s/use_varnish:.*/use_varnish: 1/" ./etc/config.yaml
-elif [[ $command == "disable" ]]; then
-    sed -ie "s/use_varnish:.*/use_varnish: 0/" ./etc/config.yaml
-else
-    echo "Usage: ./m-varnish -c enable/disable (-f to force restart services)"
-    exit 0
-fi
-
 vagrant_dir=$(cd "$(dirname "$0")"; pwd)
 cd ${vagrant_dir}
-if [[ $force_restart_services == 1 ]]; then
-    vagrant ssh -c "m-configure_varnish -f"
-else
-    vagrant ssh -c "m-configure_varnish"
-fi
-
-echo "Done."
+vagrant ssh -c "m-varnish ${@}"

scripts/guest/m-configure_varnish renamed to scripts/guest/configure_varnish

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -ex
-
 # Get args
 while getopts 'f' flag; do
   case "${flag}" in

scripts/guest/m-varnish

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+if [[ $1 == "help" ]]; then
+    echo "Usage: ./m-varnish enable/disable"
+    exit 0
+fi
+
+# Check if user created config.yaml file
+if [[ ! -f /vagrant/etc/config.yaml ]]; then
+    echo "Please make sure you have create a config.yaml file copy from etc/config.yaml.dist"
+    exit 1
+fi
+
+if [[ -z "$(grep "use_varnish:" /vagrant/etc/config.yaml)" ]]; then
+    sed -i '/environment:/a \ \ use_varnish: 0' /vagrant/etc/config.yaml
+fi
+
+if [[ $1 == "enable" ]]; then
+    sed -ie "s/use_varnish:.*/use_varnish: 1/" /vagrant/etc/config.yaml
+elif [[ $1 == "disable" ]]; then
+    sed -ie "s/use_varnish:.*/use_varnish: 0/" /vagrant/etc/config.yaml
+else
+    echo "Usage: ./m-varnish enable/disable"
+    exit 1
+fi
+
+configure_varnish
+
+echo "Done."

scripts/provision/configure_environment_recurring.sh

@@ -67,7 +67,7 @@ else
 fi
 
 # Configure Varnish FPC, if enabled
-bash ${vagrant_dir}/scripts/guest/m-configure_varnish -f
+configure_varnish -f
 
 # Setup PHP
 php_ini_paths=( /etc/php/7.0/cli/php.ini /etc/php/5.6/cli/php.ini )