From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 31 May 2023 15:09:14 +0000 (+0100)
Subject: Use the db:create command for vagrant provisioning
X-Git-Tag: live~737^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7842c1f283590a4a6b89930c644fb14bf29e68ee

Use the db:create command for vagrant provisioning

This is to align with the INSTALL.md instructions
---

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index afabc4885..074a77277 100644
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -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
-    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
@@ -45,6 +43,8 @@ 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 bundle exec rails db:migrate
 popd