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

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 47534b84d66a4fb7e03a617ba6e77a58284381cd..f19234a8ec0f04ba8b4ac380d85b83734e1c1067 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -1,62 +1,50 @@
 #!/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
 
 # make sure we have up-to-date packages
 apt-get update
 
-## vagrant grub-pc fix from: https://gist.github.com/jrnickell/6289943
-# parameters
-echo "grub-pc grub-pc/kopt_extracted boolean true" | debconf-set-selections
-echo "grub-pc grub2/linux_cmdline string" | debconf-set-selections
-echo "grub-pc grub-pc/install_devices multiselect /dev/sda" | debconf-set-selections
-echo "grub-pc grub-pc/install_devices_failed_upgrade boolean true" | debconf-set-selections
-echo "grub-pc grub-pc/install_devices_disks_changed multiselect /dev/sda" | debconf-set-selections
-# vagrant grub fix
-dpkg-reconfigure -f noninteractive grub-pc
-
 # upgrade all packages
 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 ruby ruby-dev ruby-bundler \
+                     libxml2-dev libxslt1-dev nodejs npm \
+                     build-essential git-core \
+                     postgresql postgresql-contrib libpq-dev libvips-dev libyaml-dev \
+                     libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
+npm install --global yarn
 
 ## 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
+# 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 -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
 fi
-# build and set up postgres extensions
-pushd db/functions
-sudo -u vagrant make
-sudo -u vagrant psql openstreetmap -c "drop function if exists maptile_for_point(int8, int8, int4)"
-sudo -u vagrant psql openstreetmap -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '/srv/openstreetmap-website/db/functions/libpgosm.so', 'maptile_for_point' 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
+    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
+if [ ! -f config/storage.yml ]; then
+    cp config/example.storage.yml config/storage.yml
 fi
+touch config/settings.local.yml
+# create the databases
+sudo -u vagrant bundle exec rails db:create
 # migrate the database to the latest version
-sudo -u vagrant rake db:migrate
+sudo -u vagrant bundle exec rails db:migrate
 popd