From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 May 2023 17:37:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4052'
X-Git-Tag: live~1767
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e9de1537f924c0ceb9c42086da5a54abba268126?hp=a209a72775787e181af01efc3214034cbe845055

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index af183a5ff..d48fb9d0b 100644
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -34,8 +34,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
@@ -46,6 +44,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