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

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index e10e144a8bcd8fd1206e89e186c4e5a6e05ec908..afabc48857535866304c6888553be361340f12ae 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -18,10 +18,9 @@ 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 \
 # install packages as explained in INSTALL.md
 apt-get install -y ruby2.7 libruby2.7 ruby2.7-dev \
                      libxml2-dev libxslt1-dev nodejs yarnpkg \

-                     apache2 apache2-dev build-essential git-core firefox-geckodriver \
+                     build-essential git-core firefox-geckodriver \

                      postgresql postgresql-contrib libpq-dev libvips-dev \
                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev
                      postgresql postgresql-contrib libpq-dev libvips-dev \
                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev

-gem2.7 install rake

 gem2.7 install --version "~> 2.1.4" bundler
 
 ## install the bundle necessary for openstreetmap-website
 gem2.7 install --version "~> 2.1.4" bundler
 
 ## install the bundle necessary for openstreetmap-website


@@ -29,7 +28,7 @@ pushd /srv/openstreetmap-website
 # do bundle install as a convenience
 bundle install --retry=10 --jobs=2
 # do yarn install as a convenience
 # do bundle install as a convenience
 bundle install --retry=10 --jobs=2
 # do yarn install as a convenience

-bundle exec rake yarn:install
+bundle exec bin/yarn install

 # create user and database for openstreetmap-website
 db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
 if [ "$db_user_exists" != "1" ]; then
 # create user and database for openstreetmap-website
 db_user_exists=`sudo -u postgres psql postgres -tAc "select 1 from pg_roles where rolname='vagrant'"`
 if [ "$db_user_exists" != "1" ]; then


@@ -47,5 +46,5 @@ if [ ! -f config/storage.yml ]; then
 fi
 touch config/settings.local.yml
 # migrate the database to the latest version
 fi
 touch config/settings.local.yml
 # migrate the database to the latest version

-sudo -u vagrant bundle exec rake db:migrate
+sudo -u vagrant bundle exec rails db:migrate

 popd
 popd