Merge branch 'master' into openstreetbugs

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

diff --git a/config/example.application.yml b/config/example.application.yml
index ab5c9a846be2e7e7615fb1b1f8907c68308cd863..501b3d2ad4bdbbc64d94faded0b929d7ac304d17 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,4 +1,4 @@
-standard_settings: &standard_settings
+defaults: &defaults
   # The server URL
   server_url: "www.openstreetmap.org"
   # The generator
@@ -24,6 +24,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
+  # 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
@@ -41,6 +43,10 @@ standard_settings: &standard_settings
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""
+  # Users to show as being nearby
+  nearby_users: 30
+  # Max radius, in km, for nearby users
+  nearby_radius: 50
   # Spam threshold
   spam_threshold: 50
   # Default legale (jurisdiction location) for contributor terms
@@ -51,18 +57,34 @@ standard_settings: &standard_settings
   # 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
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
   nominatim_url: "http://nominatim.openstreetmap.org/"
+  # Default editor
+  default_editor: "potlatch2"
+  # OAuth consumer key for Potlatch 2
+  #potlatch2_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
+  require_terms_agreed: false
+  # Piwik details
+  #piwik_location: "piwik.openstreetmap.org"
+  #piwik_site: 1
+  #piwik_signup_goal: 1
 
 development:
-  <<: *standard_settings
+  <<: *defaults
 
 production:
-  <<: *standard_settings
+  <<: *defaults
 
 test:
-  <<: *standard_settings
+  <<: *defaults