Fix misleading wording

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 3c5b3a3e9691f516ec527076673d88e26771be36..b5d4db363f054d8b14af4eab88777850b2bf99d2 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,14 +1,19 @@
-standard_settings: &standard_settings
+defaults: &defaults
   # 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/"
+  # Support email address
+  support_email: support@openstreetmap.org
   # Sender addresses for emails
-  email_from: "OpenStreetMap <webmaster@openstreetmap.org>"
+  email_from: "OpenStreetMap <support@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
@@ -24,6 +29,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
@@ -38,6 +45,8 @@ standard_settings: &standard_settings
   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: ""
@@ -49,40 +58,79 @@ standard_settings: &standard_settings
   spam_threshold: 50
   # Default legale (jurisdiction location) for contributor terms
   default_legale: GB
-  # Memory limits (in Mb)
-  #soft_memory_limit: 512
-  #hard_memory_limit: 2048
   # 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: ""
+  # Log file to use for logstash
+  #logstash_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/"
+  nominatim_url: "//nominatim.openstreetmap.org/"
   # Default editor
-  default_editor: "potlatch2"
+  default_editor: "id"
   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
+  # OAuth consumer key for the web site
+  #oauth_key: ""
+  # OAuth consumer key for iD
+  #id_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
+  # Imagery to return in capabilities as blacklisted
+  imagery_blacklist:
+    # Current Google imagery URLs have google or googleapis in the domain
+    # with a vt or kh endpoint, and x, y and z query parameters
+    - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
+  # URL of Overpass instance to use for feature queries
+  overpass_url: "//overpass-api.de/api/interpreter"
+  # Routing endpoints
+  graphhopper_url: "//graphhopper.com/api/1/route"
+  mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route"
+  mapzen_valhalla_url: "//valhalla.mapzen.com/route"
+  osrm_url: "//router.project-osrm.org/route/v1/driving/"
+  # External authentication credentials
+  #google_auth_id: ""
+  #google_auth_secret: ""
+  #google_openid_realm: ""
+  #facebook_auth_id: ""
+  #facebook_auth_secret: ""
+  #windowslive_auth_id: ""
+  #windowslive_auth_secret: ""
+  #github_auth_id: ""
+  #github_auth_secret: ""
+  # MapQuest authentication details
+  #mapquest_key: ""
+  # Mapzen authentication details
+  #mapzen_valhalla_key: ""
+  # Thunderforest authentication details
+  #thunderforest_key: ""
 
 development:
-  <<: *standard_settings
+  <<: *defaults
 
 production:
-  <<: *standard_settings
+  <<: *defaults
 
 test:
-  <<: *standard_settings
+  <<: *defaults
+  # Geonames credentials for testing
+  geonames_username: "dummy"
+  # External authentication credentials for testing
+  google_auth_id: "dummy"
+  google_auth_secret: "dummy"
+  google_openid_realm: "https://www.openstreetmap.org"
+  facebook_auth_id: "dummy"
+  facebook_auth_secret: "dummy"
+  windowslive_auth_id: "dummy"
+  windowslive_auth_secret: "dummy"
+  github_auth_id: "dummy"
+  github_auth_secret: "dummy"