X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0546ebb7b0ad3cd9ee904fa988908dde676d9596..f0467745bfa9a8c3309ab1b187a3a575d0f20d01:/script/vagrant/setup/provision.sh?ds=sidebyside

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 912a62958..5eb49b24e 100644
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
+# abort on error
+set -e
+
 # set locale to UTF-8 compatible. apologies to non-english speakers...
+locale-gen en_GB.utf8
 update-locale LANG=en_GB.utf8 LC_ALL=en_GB.utf8
-locale-gen
 export LANG=en_GB.utf8
 export LC_ALL=en_GB.utf8
 
@@ -13,41 +16,51 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
-apt-get install -y ruby1.9.1 libruby1.9.1 ruby1.9.1-dev ri1.9.1 \
-    libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
-    apache2 apache2-threaded-dev build-essential git-core \
-    postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
-    libsasl2-dev
-gem1.9.1 install bundle
+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 \
+                     libsasl2-dev imagemagick libffi-dev libgd-dev libarchive-dev libbz2-dev
+gem2.5 install rake
+gem2.5 install --version "~> 1.16.2" bundler
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
 # do bundle install as a convenience
-sudo -u vagrant -H bundle install
+bundle install --retry=10 --jobs=2
 # 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 -H createdb -E UTF-8 -O vagrant openstreetmap
-		sudo -u vagrant -H createdb -E UTF-8 -O vagrant osm_test
-		# add btree_gist extension
-		sudo -u vagrant -H psql -c "create extension btree_gist" openstreetmap
-		sudo -u vagrant -H psql -c "create extension btree_gist" osm_test
+    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
+
+
+# install PostgreSQL functions
+sudo -u vagrant psql -d openstreetmap -f db/functions/functions.sql
+################################################################################
+# *IF* you want a vagrant image which supports replication (or perhaps you're
+# using this script to provision some other server and want replication), then
+# uncomment the following lines (until popd) and comment out the one above
+# (functions.sql).
+################################################################################
+#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 ST#RICT"
+#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/application.yml ]; then
-		sudo -u vagrant cp config/example.application.yml config/application.yml
+    sudo -u vagrant cp config/example.database.yml config/database.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 rake db:migrate
 popd