From: Tom Hughes Date: Wed, 26 Apr 2023 17:19:30 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4021' X-Git-Tag: live~2095 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/697849f78d66c3da4361848feccc1de2cf8d5f36?hp=bfda3f439f1cdf558f492f73775b1d0648130006 Merge remote-tracking branch 'upstream/pull/4021' --- diff --git a/INSTALL.md b/INSTALL.md index 9ea442476..ea892ae29 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -33,7 +33,7 @@ These can be installed on Ubuntu 20.04 or later with: sudo apt-get update sudo apt-get install ruby2.7 libruby2.7 ruby2.7-dev \ libvips-dev libxml2-dev libxslt1-dev nodejs \ - apache2 apache2-dev build-essential git-core firefox-geckodriver \ + build-essential git-core firefox-geckodriver \ postgresql postgresql-contrib libpq-dev libsasl2-dev \ libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg sudo gem2.7 install bundler diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh index e114f4616..2ca780ff1 100644 --- a/script/vagrant/setup/provision.sh +++ b/script/vagrant/setup/provision.sh @@ -18,7 +18,7 @@ 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 \ - 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 gem2.7 install rake