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

[rails.git] / script / vagrant / setup / provision.sh

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 93e91e721dc8e0f8d04f36f39254f2846344d855..bfe12a3c6f5eb96de36fff6dfd8fbcf5797fc2c0 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -17,10 +17,10 @@ apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
 apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
-                     libmagickwand-dev libxml2-dev libxslt1-dev nodejs yarnpkg \
+                     libxml2-dev libxslt1-dev nodejs yarnpkg \
                      apache2 apache2-dev build-essential git-core firefox-geckodriver \
-                     postgresql postgresql-contrib libpq-dev \
-                     libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
+                     postgresql postgresql-contrib libpq-dev libvips-dev \
+                     libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
 gem2.7 install rake
 gem2.7 install --version "~> 2.1.4" bundler
 
@@ -50,7 +50,6 @@ sudo -u vagrant psql -d openstreetmap -f db/functions/functions.sql
 #pushd db/functions
 #sudo -u vagrant make
 #sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'tile_for_point' LANGUAGE C STRICT"
-#sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'xid_to_int4' LANGUAGE C STRICT"
 #popd
 
 
@@ -58,6 +57,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