github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/39/head
Juha Jantunen 2017-03-02 09:07:33 +02:00 committed by Franz Liedke
parent 569e3a3b5e
commit 4479d857b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -292,7 +292,7 @@ Vagrant.configure("2") do |config|
########## ##########
# Provision Composer # 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 # Provision Laravel
# config.vm.provision "shell", path: "#{github_url}/scripts/laravel.sh", privileged: false, args: [server_ip, laravel_root_folder, public_folder, laravel_version] # config.vm.provision "shell", path: "#{github_url}/scripts/laravel.sh", privileged: false, args: [server_ip, laravel_root_folder, public_folder, laravel_version]

4
scripts/environment.sh
View File

@ -42,7 +42,7 @@ block="
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
fastcgi_param LARA_ENV local; # Environment variable for Laravel 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; fastcgi_param HTTPS off;
} }
@ -82,7 +82,7 @@ block="
text/plain \ text/plain \
text/xml; text/xml;
gzip_buffers 16 8k; gzip_buffers 16 8k;
gzip_disable "MSIE [1-6]\.(?!.*SV1)"; gzip_disable \"MSIE [1-6]\.(?!.*SV1)\";
} }
" "