Don't show older/newer buttons if all items fit on one page

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

diff --git a/script/vagrant/setup/provision.sh b/script/vagrant/setup/provision.sh
index e10e144a8bcd8fd1206e89e186c4e5a6e05ec908..f19234a8ec0f04ba8b4ac380d85b83734e1c1067 100644 (file)
--- a/script/vagrant/setup/provision.sh
+++ b/script/vagrant/setup/provision.sh
@@ -16,26 +16,23 @@ apt-get update
 apt-get upgrade -y
 
 # install packages as explained in INSTALL.md
 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 \
-                     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 \
+                     postgresql postgresql-contrib libpq-dev libvips-dev libyaml-dev \

                      libsasl2-dev libffi-dev libgd-dev libarchive-dev libbz2-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
 # do bundle install as a convenience
 bundle install --retry=10 --jobs=2
 # do yarn install as a convenience
 
 ## install the bundle necessary for openstreetmap-website
 pushd /srv/openstreetmap-website
 # 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
     sudo -u postgres createuser -s vagrant
 # 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
     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
 fi
 
 # set up sample configs


@@ -46,6 +43,8 @@ if [ ! -f config/storage.yml ]; then
     cp config/example.storage.yml config/storage.yml
 fi
 touch config/settings.local.yml
     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
 # 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