From 4479d857b6c29e154f2642dfeef7cedd6e74926e Mon Sep 17 00:00:00 2001 From: Juha Jantunen Date: Thu, 2 Mar 2017 09:07:33 +0200 Subject: [PATCH] Fixes for Vaprobash environment (#38) * Escape some quotes in environment.sh * Fix incompatibility between Vaprobash 1.4.2 where first parameter for composer.sh is now treated as a Github token Ref: https://github.com/fideloper/Vaprobash/pull/493 --- Vagrantfile | 2 +- scripts/environment.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index c88592e..78d30a9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -292,7 +292,7 @@ Vagrant.configure("2") do |config| ########## # Provision Composer - config.vm.provision "shell", path: "#{github_url}/scripts/composer.sh", privileged: false, args: composer_packages.join(" ") + config.vm.provision "shell", path: "#{github_url}/scripts/composer.sh", privileged: false, args: ["", composer_packages.join(" ")] # Provision Laravel # config.vm.provision "shell", path: "#{github_url}/scripts/laravel.sh", privileged: false, args: [server_ip, laravel_root_folder, public_folder, laravel_version] diff --git a/scripts/environment.sh b/scripts/environment.sh index 2d481cf..49e0cb6 100644 --- a/scripts/environment.sh +++ b/scripts/environment.sh @@ -42,7 +42,7 @@ block=" include fastcgi_params; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; fastcgi_param LARA_ENV local; # Environment variable for Laravel - fastcgi_param HTTP_PROXY ""; # Fix for https://httpoxy.org/ vulnerability + fastcgi_param HTTP_PROXY \"\"; # Fix for https://httpoxy.org/ vulnerability fastcgi_param HTTPS off; } @@ -82,7 +82,7 @@ block=" text/plain \ text/xml; gzip_buffers 16 8k; - gzip_disable "MSIE [1-6]\.(?!.*SV1)"; + gzip_disable \"MSIE [1-6]\.(?!.*SV1)\"; } "