Update vagrant configuration

Use a common box for all platforms and fix up various
issues with the provisioning script.
This commit is contained in:
Tom Hughes 2018-05-31 22:47:49 +01:00
parent 41326fd6d4
commit 619fa7d802
2 changed files with 19 additions and 19 deletions

View file

@ -20,37 +20,37 @@ apt-get install -y ruby2.3 libruby2.3 ruby2.3-dev \
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
libsasl2-dev imagemagick phantomjs
gem2.3 install bundler
## 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
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
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
# 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"
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 ubuntu 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 ubuntu cp config/example.application.yml config/application.yml
sudo -u vagrant cp config/example.application.yml config/application.yml
fi
# migrate the database to the latest version
sudo -u ubuntu rake db:migrate
sudo -u vagrant rake db:migrate
popd