Skip to content

Commit

Permalink
Fixes for Vaprobash environment (#38)
Browse files Browse the repository at this point in the history
* 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: fideloper/Vaprobash#493
  • Loading branch information
helixdonnell9 committed Mar 2, 2017
1 parent 5c16271 commit e30117e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions scripts/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)\";
}
"
Expand Down

0 comments on commit e30117e

Please sign in to comment.