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~1235
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e9de1537f924c0ceb9c42086da5a54abba268126?hp=-c

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

e9de1537f924c0ceb9c42086da5a54abba268126
diff --combined script/vagrant/setup/provision.sh
index af183a5ff,074a77277..d48fb9d0b
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@@ -16,13 -16,12 +16,13 @@@ apt-get updat
  apt-get upgrade -y
  
  # install packages as explained in INSTALL.md
 -apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
 -                     libxml2-dev libxslt1-dev nodejs yarnpkg \
 -                     build-essential git-core firefox-geckodriver \
 +apt-get install -y ruby3.0 libruby3.0 ruby3.0-dev \
 +                     libxml2-dev libxslt1-dev nodejs npm \
 +                     build-essential git-core \
                       postgresql postgresql-contrib libpq-dev libvips-dev \
                       libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
 -gem2.7 install --version "~> 2.1.4" bundler
 +gem3.0 install --version "~> 2.1.4" bundler
 +npm install --global yarn
  
  ## install the bundle necessary for openstreetmap-website
  pushd /srv/openstreetmap-website
@@@ -34,8 -33,6 +34,6 @@@ bundle exec bin/yarn instal
  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 -43,8 +44,8 @@@ if [ ! -f config/storage.yml ]; the
      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