X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..860887de5272c3e2a39cb7e0c9db6f0acba1b4c6:/INSTALL.md?ds=inline diff --git a/INSTALL.md b/INSTALL.md index 09e3b12f7..034362911 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -18,26 +18,24 @@ of packages required before you can get the various gems installed. ## Minimum requirements -* Ruby 1.9.3 +* Ruby 2.0 * RubyGems 1.3.1+ * Postgres 8.3+ * ImageMagick * Bundler * Javascript Runtime -These can be installed on Ubuntu 10.10 or later with: +These can be installed on Ubuntu 14.04 or later with: ``` -sudo apt-get install ruby1.9.1 libruby1.9.1 ruby1.9.1-dev ri1.9.1 \ +sudo apt-get install ruby2.0 libruby2.0 ruby2.0-dev \ libmagickwand-dev libxml2-dev libxslt1-dev nodejs \ apache2 apache2-threaded-dev build-essential git-core \ postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \ - libsasl2-dev -sudo gem1.9.1 install bundler + libsasl2-dev imagemagick +sudo gem2.0 install bundler ``` -Note that the "1.9.1" Ubuntu packages do in fact contain ruby 1.9.3. - ### Alternative platforms #### Fedora @@ -49,7 +47,7 @@ sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \ libxml2-devel js \ gcc gcc-c++ git \ postgresql postgresql-server postgresql-contrib postgresql-devel \ - perl-podlators + perl-podlators ImageMagick ``` If you didn't already have Postgres installed then create a Postgres instance and start the server: @@ -160,14 +158,6 @@ bundle exec rake db:create We need to load the btree-gist extension, which is needed for showing changesets on the history tab. -For PostgreSQL < 9.1 (change the version number in the path as necessary): - -``` -psql -d openstreetmap < /usr/share/postgresql/9.0/contrib/btree_gist.sql -``` - -For PostgreSQL >= 9.1: - ``` psql -d openstreetmap -c "CREATE EXTENSION btree_gist" ``` @@ -203,7 +193,7 @@ bundle exec rake db:migrate To ensure that everything is set up properly, you should now run: ``` -bundle exec rake test +bundle exec rake test:db ``` This test will take a few minutes, reporting tests run, assertions, and any errors. If you receive no errors, then your installation is successful.