Use OAuth for notes API calls and require authentication to close

[rails.git] / config / example.application.yml

diff --git a/config/example.application.yml b/config/example.application.yml
index 90e2cc74ed39494fb58fe960d74fddf73de6461a..30f367f1cc0562a3391beabd0e7cd2a00381e93f 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -3,12 +3,15 @@ defaults: &defaults
   server_url: "www.openstreetmap.org"
   # The generator
   generator: "OpenStreetMap server"
+  copyright_owner: "OpenStreetMap and contributors"
+  attribution_url: "http://www.openstreetmap.org/copyright"
+  license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
   # Sender addresses for emails
   email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
   email_return_path: "bounces@openstreetmap.org"
   # API version
   api_version: "0.6"
-  # Application status - posstible values are:
+  # Application status - possible values are:
   #   :online - online and operating normally
   #   :api_readonly - site online but API in read-only mode
   #   :api_offline - site online but API offline
@@ -40,6 +43,8 @@ defaults: &defaults
   max_messages_per_hour: 60
   # Domain for handling message replies
   #messages_domain: "messages.openstreetmap.org"
+  # Geonames authentication details
+  #geonames_username: ""
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""
@@ -57,8 +62,8 @@ defaults: &defaults
   # Location of GPX traces and images
   gpx_trace_dir: "/home/osm/traces"
   gpx_image_dir: "/home/osm/images"
-  # Location of data for file columns
-  #file_column_root: ""
+  # Location of data for attachments
+  attachments_dir: ":rails_root/public/attachments"
   # Log file to use
   #log_path: ""
   # List of memcache servers to use for caching
@@ -71,6 +76,8 @@ defaults: &defaults
   default_editor: "potlatch2"
   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
+  # OAuth consumer key for the web site
+  #oauth_key: ""
   # Whether to require users to view the CTs before continuing to edit...
   require_terms_seen: false
   # Whether to require users to agree to the CTs before editing