X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f4651f68e2ab40b58081f775cb28d48f79a6c753..bfc8c5f6de1bc79f6d81a28e5c7e10ff300100b8:/script/vagrant/setup/provision.sh diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh index 2ca780ff1..f6ecd4ed5 100644 --- a/script/vagrant/setup/provision.sh +++ b/script/vagrant/setup/provision.sh @@ -3,12 +3,6 @@ # abort on error set -e -# set locale to UTF-8 compatible. apologies to non-english speakers... -locale-gen en_GB.utf8 -update-locale LANG=en_GB.utf8 LC_ALL=en_GB.utf8 -export LANG=en_GB.utf8 -export LC_ALL=en_GB.utf8 - # make sure we have up-to-date packages apt-get update @@ -16,13 +10,12 @@ apt-get update 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 \ - postgresql postgresql-contrib libpq-dev libvips-dev \ +apt-get install -y ruby ruby-dev ruby-bundler \ + libxml2-dev libxslt1-dev nodejs npm \ + build-essential git-core firefox-esr \ + postgresql postgresql-contrib libpq-dev libvips-dev libyaml-dev \ libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-dev -gem2.7 install rake -gem2.7 install --version "~> 2.1.4" bundler +npm install --global yarn ## install the bundle necessary for openstreetmap-website pushd /srv/openstreetmap-website @@ -34,8 +27,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 +37,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 rake db:migrate +sudo -u vagrant bundle exec rails db:migrate popd