Update documentation for new approach to settings

diff --git a/CONFIGURE.md b/CONFIGURE.md
index c6444ffa9efe773c5edda6b735148f4d502b6c81..91a64119ed33cb5d7ccf057ba266a6684f323bce 100644 (file)
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -2,6 +2,10 @@
 
 After [installing](INSTALL.md) this software, you may need to carry out some of these configuration steps, depending on your tasks.
 
 
 After [installing](INSTALL.md) this software, you may need to carry out some of these configuration steps, depending on your tasks.
 

+## Application configuration
+
+Many settings are available in `config/settings.yml`. You can customize your installation of The Rails Port by overriding these values using `config/settings.local.yml`
+

 ## Populating the database
 
 Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract.
 ## Populating the database
 
 Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract.


@@ -71,11 +75,11 @@ Do the following:
 * Everything else can be left with the default blank values.
 * Click the "Register" button
 * On the next page, copy the "consumer key"
 * Everything else can be left with the default blank values.
 * Click the "Register" button
 * On the next page, copy the "consumer key"

-* Edit config/application.yml in your rails tree
-* Uncomment and change the "potlatch2_key" configuration value
+* Edit config/settings.local.yml in your rails tree
+* Add the "potlatch2_key" configuration key and the consumer key as the value

 * Restart your rails server
 
 * Restart your rails server
 

-An example excerpt from application.yml:
+An example excerpt from settings.local.yml:

 
 ```
 # Default editor
 
 ```
 # Default editor


@@ -86,8 +90,6 @@ potlatch2_key: "8lFmZPsagHV4l3rkAHq0hWY5vV3Ctl3oEFY1aXth"
 
 Follow the same process for registering and configuring iD (`id_key`) and the website/Notes (`oauth_key`), or to save time, simply reuse the same consumer key for each.
 
 
 Follow the same process for registering and configuring iD (`id_key`) and the website/Notes (`oauth_key`), or to save time, simply reuse the same consumer key for each.
 

-**NOTE:** If you forget to set up OAuth, then you will get an error message similar to `uninitialized constant ActionView::CompiledTemplates::ID_KEY`.
-

 ## Troubleshooting
 
 Rails has its own log.  To inspect the log, do this:
 ## Troubleshooting
 
 Rails has its own log.  To inspect the log, do this:

diff --git a/INSTALL.md b/INSTALL.md
index 8e47cb2667473bac991125e237138ac39e0d457f..f069521eb80feacc08a52b4d12614483dcea4247 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -115,16 +115,6 @@ cd openstreetmap-website
 bundle install
 ```
 
 bundle install
 ```
 

-## Application setup
-
-We need to create the `config/application.yml` file from the example template. This contains various configuration options.
-
-```
-cp config/example.application.yml config/application.yml
-```
-
-You can customize your installation of The Rails Port by changing the values in `config/application.yml`
-

 ## Database setup
 
 The Rails Port uses three databases -  one for development, one for testing, and one for production. The database-specific configuration
 ## Database setup
 
 The Rails Port uses three databases -  one for development, one for testing, and one for production. The database-specific configuration