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

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index a3cfec7f89738285df1d33cce2b321d941832309..5eb49b24ec97fa59ac71f7df7dec6e85e2b98633 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,41 +16,51 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md

-apt-get install -y ruby2.3 libruby2.3 ruby2.3-dev \
+apt-get install -y ruby2.5 libruby2.5 ruby2.5-dev \

                      libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
                      libmagickwand-dev libxml2-dev libxslt1-dev nodejs \

-                     apache2 apache2-dev build-essential git-core \
-                     postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
-                     libsasl2-dev imagemagick
-gem2.3 install bundler
+                     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
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
 # do bundle install as a convenience

-sudo -u ubuntu -H bundle install --retry=10 --jobs=2
+bundle install --retry=10 --jobs=2

 # create user and database for openstreetmap-website
 # create user and database for openstreetmap-website

-db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='ubuntu'"`
+db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`

 if [ "$db_user_exists" != "1" ]; then
 if [ "$db_user_exists" != "1" ]; then

-               sudo -u postgres createuser -s ubuntu
-               sudo -u ubuntu createdb -E UTF-8 -O ubuntu openstreetmap
-               sudo -u ubuntu createdb -E UTF-8 -O ubuntu osm_test
-               # add btree_gist extension
-               sudo -u ubuntu psql -c "create extension btree_gist" openstreetmap
-               sudo -u ubuntu 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
 fi

-# build and set up postgres extensions
-pushd db/functions
-sudo -u ubuntu make
-sudo -u ubuntu 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 ubuntu 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 ubuntu 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
 # set up sample configs
 if [ ! -f config/database.yml ]; then

-               sudo -u ubuntu cp config/example.database.yml config/database.yml
-fi
-if [ ! -f config/application.yml ]; then
-               sudo -u ubuntu cp config/example.application.yml config/application.yml
+    sudo -u vagrant cp config/example.database.yml config/database.yml

 fi
 fi

+touch config/settings.local.yml

 # migrate the database to the latest version
 # migrate the database to the latest version

-sudo -u ubuntu rake db:migrate
+sudo -u vagrant bundle exec rake db:migrate

 popd
 popd