X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/293ce4880efcada440634b19966d1c51bf2cee97..c10c10e7345524ca6f8ed8e93993ef2c5cc80797:/CONFIGURE.md?ds=sidebyside diff --git a/CONFIGURE.md b/CONFIGURE.md index 9183bc229..dcc8ae2ac 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -47,8 +47,6 @@ $ bundle exec rails console => #[ ... ] >> user.roles.create(:role => "moderator", :granter_id => user.id) => #[ ... ] ->> user.save! -=> true >> quit ``` @@ -63,7 +61,7 @@ For iD, do the following: * Go to "[OAuth 2 applications](http://localhost:3000/oauth2/applications)" on the My settings page. * Click on "Register new application". -* Unless you have set up alternatives, use Name: "Local iD" and Main Application URL: "http://localhost:3000" +* Unless you have set up alternatives, use Name: "Local iD" and Redirect URIs: "http://localhost:3000" * Check boxes for the following Permissions * 'Read user preferences' * 'Modify user preferences' @@ -127,12 +125,12 @@ If your installation stops working for some reason: * The OSM database schema is changed periodically and you need to keep up with these improvements. Go to your `openstreetmap-website` directory and run: ``` -bundle exec rake db:migrate +bundle exec rails db:migrate ``` ## Testing on the osm dev server -For example, after developing a patch for `openstreetmap-website`, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of openstreetmap-website on the dev server in ones user directory](https://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). +For example, after developing a patch for `openstreetmap-website`, you might want to demonstrate it to others or ask for comments and testing. To do this you can [set up an instance of openstreetmap-website on the dev server in your user directory](https://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). # Contributing @@ -144,8 +142,6 @@ If you want to deploy `openstreetmap-website` for production use, you'll need to * It's not recommended to use `rails server` in production. Our recommended approach is to use [Phusion Passenger](https://www.phusionpassenger.com/). Instructions are available for [setting it up with most web servers](https://www.phusionpassenger.com/documentation_and_support#documentation). * Passenger will, by design, use the Production environment and therefore the production database - make sure it contains the appropriate data and user accounts. -* Your production database will also need the extensions and functions installed - see [INSTALL.md](INSTALL.md) * The included version of the map call is quite slow and eats a lot of memory. You should consider using [CGIMap](https://github.com/zerebubuth/openstreetmap-cgimap) instead. -* Make sure you generate the i18n files and precompile the production assets: `RAILS_ENV=production rake i18n:js:export assets:precompile` +* Make sure you generate the i18n files and precompile the production assets: `RAILS_ENV=production rails i18n:js:export assets:precompile` * Make sure the web server user as well as the rails user can read, write and create directories in `tmp/`. -* If you expect to serve a lot of `/changes` API calls, then you might also want to install the shared library versions of the SQL functions.