Avoid relying on the order in which emails are sent

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

diff --git a/config/example.application.yml b/config/example.application.yml
index bc66923fea88efbb870825b1e132b1660b7b9e4d..2e41adbfc0d8716eaf222bfbc6c29e7739ca3064 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -5,13 +5,13 @@ defaults: &defaults
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
   attribution_url: "http://www.openstreetmap.org/copyright"

-  license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+  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


@@ -27,6 +27,8 @@ defaults: &defaults
   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


@@ -69,19 +71,26 @@ defaults: &defaults
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
   # 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

-  default_editor: "potlatch2"
+  default_editor: "id"

   # OAuth consumer key for Potlatch 2
   #potlatch2_key: ""
   # 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
   # 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:
+    - ".*\\.googleapis\\.com/.*"
+    - ".*\\.google\\.com/.*"
+    - ".*\\.google\\.ru/.*"
+  # URL of Overpass instance to use for feature queries
+  overpass_url: "//overpass-api.de/api/interpreter"

 
 development:
   <<: *defaults
 
 development:
   <<: *defaults


@@ -91,3 +100,5 @@ production:
 
 test:
   <<: *defaults
 
 test:
   <<: *defaults

+  # Geonames credentials for testing
+  geonames_username: "dummy"