add lock, information and water classes for nominatim terms

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 8fb296ae6ea303461e2ca38827184522c6f21e0f..f6ecd4ed5742ab0a28b07a5017c541fdfdd55b92 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -3,12 +3,6 @@
 # abort on error
 set -e
 
 # 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
-export LANG=en_GB.utf8
-export LC_ALL=en_GB.utf8
-

 # make sure we have up-to-date packages
 apt-get update
 
 # make sure we have up-to-date packages
 apt-get update
 


@@ -18,8 +12,8 @@ apt-get upgrade -y
 # install packages as explained in INSTALL.md
 apt-get install -y ruby ruby-dev ruby-bundler \
                      libxml2-dev libxslt1-dev nodejs npm \
 # install packages as explained in INSTALL.md
 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 \
+                     build-essential git-core firefox-esr \
+                     postgresql postgresql-contrib libpq-dev libvips-dev libyaml-dev \

                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
 npm install --global yarn
 
                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
 npm install --global yarn
 


@@ -33,8 +27,6 @@ bundle exec bin/yarn install
 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
 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

 fi
 
 # set up sample configs
 fi
 
 # set up sample configs


@@ -45,6 +37,8 @@ if [ ! -f config/storage.yml ]; then
     cp config/example.storage.yml config/storage.yml
 fi
 touch config/settings.local.yml
     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 bundle exec rails db:migrate
 popd
 # migrate the database to the latest version
 sudo -u vagrant bundle exec rails db:migrate
 popd