Merge remote-tracking branch 'upstream/pull/3455'

diff --git a/INSTALL.md b/INSTALL.md
index 1faf4bf2232a1fead17b43029eb52fd98c1392e7..68b0d120eed37af098e356d3b4b08fe8fa8cfa6e 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -90,7 +90,7 @@ Installing other dependencies:
 
 * Install Homebrew from https://brew.sh/
 * Install the latest version of Ruby: `brew install ruby`
-* Install other dependencies: `brew install imagemagick libxml2 gd yarn pngcrush optipng pngquant jhead jpegoptim gifsicle svgo`
+* Install other dependencies: `brew install imagemagick libxml2 gd yarn pngcrush optipng pngquant jhead jpegoptim gifsicle svgo advancecomp`
 * Install Bundler: `gem install bundler` (you might need to `sudo gem install bundler` if you get an error about permissions - or see note below about [developer Ruby setup](#rbenv))
 
 You will need to tell `bundler` that `libxml2` is installed in a Homebrew location. If it uses the system-installed one then you will get errors installing the `libxml-ruby` gem later on<a name="macosx-bundle-config"></a>.
@@ -102,8 +102,7 @@ bundle config build.libxml-ruby --with-xml2-config=/usr/local/opt/libxml2/bin/xm
 If you want to run the tests, you need `geckodriver` as well:
 
 ```
-brew tap homebrew/cask
-brew cask install geckodriver
+brew install geckodriver
 ```
 
 Note that OS X does not have a /home directory by default, so if you are using the GPX functions, you will need to change the directories specified in config/application.yml.

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 680c17bc85263bb476f853f85fc5d05d487b95d2..6d7e51d6a0527b91f697c2a52d0849b42c5482cc 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -60,6 +60,9 @@ sudo -u vagrant psql -d openstreetmap -f db/functions/functions.sql
 if [ ! -f config/database.yml ]; then
     sudo -u vagrant cp config/example.database.yml config/database.yml
 fi
+if [ ! -f config/storage.yml ]; then
+    cp config/example.storage.yml config/storage.yml
+fi
 touch config/settings.local.yml
 # migrate the database to the latest version
 sudo -u vagrant bundle exec rake db:migrate