Varnish Support

- Changed name.
- Made script executable.
- Cache is cleared now after restarting services.

Author: Hayder Sharhan

etc/config.yaml.dist

@@ -1,26 +1,26 @@
 repository_url:
-  # [Changeable: init-project -c]
+  # [To apply changes: init-project -c]
   ce: "git@github.com:magento/magento2.git"
   ee: ""
 guest:
-  # [Changeable: init-project -f]
+  # [To apply changes: init-project -f]
   # NFS will be used for folder synchronization on *nix and OSX hosts by default.
   use_nfs: 1
   # Default is 2Gb, around 3Gb is necessary to run functional tests.
-  # [Changeable: vagrant reload]
+  # [To apply changes: vagrant reload]
   memory: 2048
   ip_address: "192.168.10.2"
   forwarded_ssh_port: 3000
 environment:
-  # [Changeable: vagrant reload]
+  # [To apply changes: vagrant reload]
   # If set to 0, PHP 5 will be installed.
   use_php7: 1
   composer_prefer_source: 0
   use_varnish: 0
 magento:
-  # [Changeable: init-project -f]
+  # [To apply changes: init-project -f]
   host_name: "magento2.vagrant2"
-  # [Changeable: m-reinstall]
+  # [To apply changes: m-reinstall]
   admin_frontname: "admin"
   language: "en_US"
   timezone: "America/Chicago"

m-varnish

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -ex
-
 # Get args
 while getopts 'fh:c:' flag; do
   case "${flag}" in
@@ -12,13 +10,13 @@ while getopts 'fh:c:' flag; do
   esac
 done
 
-if [ $help ]; then
+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
+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
@@ -35,7 +33,9 @@ fi
 vagrant_dir=$(cd "$(dirname "$0")"; pwd)
 cd ${vagrant_dir}
 if [[ $force_restart_services == 1 ]]; then
-    vagrant ssh -c "sudo bash /vagrant/scripts/guest/configure_varnish -f"
+    vagrant ssh -c "m-configure_varnish -f"
 else
-    vagrant ssh -c "sudo bash /vagrant/scripts/guest/configure_varnish"
+    vagrant ssh -c "m-configure_varnish"
 fi
+
+echo "Done."

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

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-# Enable trace printing and exit on the first error
 set -ex
 
 # Get args
@@ -17,18 +16,18 @@ vagrant_dir="/vagrant"
 # Configure Varnish if enabled in config
 restart_services=0
 use_varnish=$(bash "${vagrant_dir}/scripts/get_config_value.sh" "environment_use_varnish")
-if [ $use_varnish -eq 1 ]; then
+if [[ $use_varnish == 1 ]]; then
 
     # Configure apache files to be ready for varnish
-    if [ -z "$(grep "VirtualHost\s\*:8080" /etc/apache2/sites-enabled/magento2.conf)" ]; then
+    if [[ -z "$(grep "VirtualHost\s\*:8080" /etc/apache2/sites-enabled/magento2.conf)" ]]; then
         sudo sed -ie "s/<VirtualHost .*/<VirtualHost \*:8080>/" /etc/apache2/sites-enabled/magento2.conf
         restart_services=1
     fi
-    if [ -z "$(grep "VirtualHost\s\*:8080" /etc/apache2/sites-available/magento2.conf)" ]; then
+    if [[ -z "$(grep "VirtualHost\s\*:8080" /etc/apache2/sites-available/magento2.conf)" ]]; then
         sudo sed -ie "s/<VirtualHost .*/<VirtualHost \*:8080>/" /etc/apache2/sites-available/magento2.conf
         restart_services=1
     fi
-    if [ -z "$(grep "Listen\s8080" /etc/apache2/ports.conf)" ]; then
+    if [[ -z "$(grep "Listen\s8080" /etc/apache2/ports.conf)" ]]; then
         sudo sed -ie "s/Listen 80/Listen 8080/" /etc/apache2/ports.conf
         restart_services=1
     fi
@@ -42,15 +41,15 @@ if [ $use_varnish -eq 1 ]; then
 else
 
     # Configure apache files to run without varnish
-    if [ -z "$(grep "VirtualHost\s\*:80\b" /etc/apache2/sites-enabled/magento2.conf)" ]; then
+    if [[ -z "$(grep "VirtualHost\s\*:80\b" /etc/apache2/sites-enabled/magento2.conf)" ]]; then
         sudo sed -ie "s/<VirtualHost .*/<VirtualHost \*:80>/" /etc/apache2/sites-enabled/magento2.conf
         restart_services=1
     fi
-    if [ -z "$(grep "VirtualHost\s\*:80\b" /etc/apache2/sites-available/magento2.conf)" ]; then
+    if [[ -z "$(grep "VirtualHost\s\*:80\b" /etc/apache2/sites-available/magento2.conf)" ]]; then
         sudo sed -ie "s/<VirtualHost .*/<VirtualHost \*:80>/" /etc/apache2/sites-available/magento2.conf
         restart_services=1
     fi
-    if [ -z "$(grep "Listen\s80\b" /etc/apache2/ports.conf)" ]; then
+    if [[ -z "$(grep "Listen\s80\b" /etc/apache2/ports.conf)" ]]; then
         sudo sed -ie "s/Listen 8080/Listen 80/" /etc/apache2/ports.conf
         restart_services=1
     fi
@@ -68,15 +67,13 @@ if [[ $force_restart_services == 1 ]]; then
     echo "Force restarting Apache and Varnish"
     restart_services=1
 fi
-if [ $restart_services -eq 1 ]; then
-    if [ "$(ps -ax | pgrep varnish)" ]; then
+if [[ $restart_services == 1 ]]; then
+    if [[ "$(ps -ax | pgrep varnish)" ]]; then
         sudo pkill varnishd
     fi
-    if [ "$(ps -ax | pgrep apache2)" ]; then
-        sudo apache2ctl stop
-    fi
-    sudo apache2ctl start
-    if [ $use_varnish -eq 1 ]; then
+    sudo service apache2 restart
+    if [[ $use_varnish == 1 ]]; then
         sudo varnishd -f /etc/varnish/default.vcl
     fi
+    bash "${vagrant_dir}/scripts/guest/m-clear-cache"
 fi

scripts/provision/configure_environment_recurring.sh

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