Merge branch 'master' into notes

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 03d030a6050084fa16a7aa6dc9566e035ff6750d..30f367f1cc0562a3391beabd0e7cd2a00381e93f 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,14 +1,17 @@
-standard_settings: &standard_settings
+defaults: &defaults

   # The server URL
   server_url: "www.openstreetmap.org"
   # The generator
   generator: "OpenStreetMap server"
   # The server URL
   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"
   # 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
   #   :online - online and operating normally
   #   :api_readonly - site online but API in read-only mode
   #   :api_offline - site online but API offline


@@ -24,6 +27,8 @@ standard_settings: &standard_settings
   max_number_of_nodes: 50000
   # Maximum number of nodes that can be in a way (checked on save)
   max_number_of_way_nodes: 2000
   max_number_of_nodes: 50000
   # Maximum number of nodes that can be in a way (checked on save)
   max_number_of_way_nodes: 2000

+  # The maximum area you're allowed to request notes from, in square degrees
+  max_note_request_area: 25

   # Zoom level to use for postcode results from the geocoder
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   # Zoom level to use for postcode results from the geocoder
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder


@@ -38,6 +43,8 @@ standard_settings: &standard_settings
   max_messages_per_hour: 60
   # Domain for handling message replies
   #messages_domain: "messages.openstreetmap.org"
   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: ""
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""


@@ -55,8 +62,10 @@ standard_settings: &standard_settings
   # Location of GPX traces and images
   gpx_trace_dir: "/home/osm/traces"
   gpx_image_dir: "/home/osm/images"
   # 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
   #memcache_servers: []
   # Enable legacy OAuth 1.0 support
   # List of memcache servers to use for caching
   #memcache_servers: []
   # Enable legacy OAuth 1.0 support


@@ -67,15 +76,22 @@ standard_settings: &standard_settings
   default_editor: "potlatch2"
   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
   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 view the CTs before continuing to edit...
   require_terms_seen: false

+  # Whether to require users to agree to the CTs before editing
+  require_terms_agreed: false
+  # Piwik details
+  #piwik_location: "piwik.openstreetmap.org"
+  #piwik_site: 1
+  #piwik_signup_goal: 1

 
 development:
 
 development:

-  <<: *standard_settings
+  <<: *defaults

 
 production:
 
 production:

-  <<: *standard_settings
-  require_terms_seen: false
+  <<: *defaults

 
 test:
 
 test:

-  <<: *standard_settings
+  <<: *defaults