X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2a9346adb0477e895dca1083c0f675f690dcdf75..7a85ce0c12cf4d75561c35e2ff28e718a390d622:/script/vagrant/setup/provision.sh?ds=sidebyside

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 2ab14c36d..dfca85e79 100644
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,39 +16,35 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
-apt-get install -y ruby2.5 libruby2.5 ruby2.5-dev \
-                     libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
-                     apache2 apache2-dev build-essential git-core phantomjs \
-                     postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
-                     libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
-gem2.5 install rake
-gem2.5 install --version "~> 1.16.2" bundler
+apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
+                     libxml2-dev libxslt1-dev nodejs yarnpkg \
+                     apache2 apache2-dev build-essential git-core firefox-geckodriver \
+                     postgresql postgresql-contrib libpq-dev libvips-dev \
+                     libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
+gem2.7 install --version "~> 2.1.4" bundler
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
 # do bundle install as a convenience
 bundle install --retry=10 --jobs=2
+# do yarn install as a convenience
+bundle exec bin/yarn install
 # create user and database for openstreetmap-website
 db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
 if [ "$db_user_exists" != "1" ]; then
     sudo -u postgres createuser -s vagrant
     sudo -u vagrant createdb -E UTF-8 -O vagrant openstreetmap
     sudo -u vagrant createdb -E UTF-8 -O vagrant osm_test
-    # add btree_gist extension
-    sudo -u vagrant psql -c "create extension btree_gist" openstreetmap
-    sudo -u vagrant psql -c "create extension btree_gist" osm_test
 fi
-# build and set up postgres extensions
-pushd db/functions
-sudo -u vagrant make
-sudo -u vagrant psql openstreetmap -c "CREATE OR REPLACE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'maptile_for_point' LANGUAGE C STRICT"
-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
+
 # set up sample configs
 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 rake db:migrate
+sudo -u vagrant bundle exec rails db:migrate
 popd