Localisation updates from https://translatewiki.net.

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index 8fb296ae6ea303461e2ca38827184522c6f21e0f..f19234a8ec0f04ba8b4ac380d85b83734e1c1067 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -19,7 +19,7 @@ apt-get upgrade -y
 apt-get install -y ruby ruby-dev ruby-bundler \
                      libxml2-dev libxslt1-dev nodejs npm \
                      build-essential git-core \
 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 \
+                     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 +33,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 +43,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