Merge remote-tracking branch 'upstream/pull/1595'

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

diff --git a/config/example.application.yml b/config/example.application.yml
index ec6048521e00f119b49e0f3d6c2a3bc71b381104..5c60ccd16b4f9e6042896f5e222822c7df3a2349 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,16 +1,19 @@
 defaults: &defaults
-  # The server URL
-  server_url: "www.openstreetmap.org"
+  # The server protocol and host
+  server_protocol: "http"
+  server_url: "openstreetmap.example.com"
+  # Publisher
+  #publisher_url: ""
   # 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
+  support_email: "openstreetmap@example.com"
   # Sender addresses for emails
-  email_from: "OpenStreetMap <support@openstreetmap.org>"
-  email_return_path: "bounces@openstreetmap.org"
+  email_from: "OpenStreetMap <openstreetmap@example.com>"
+  email_return_path: "openstreetmap@example.com"
   # API version
   api_version: "0.6"
   # Application status - possible values are:
@@ -47,9 +50,8 @@ defaults: &defaults
   #messages_domain: "messages.openstreetmap.org"
   # Geonames authentication details
   #geonames_username: ""
-  # Quova authentication details
-  #quova_username: ""
-  #quova_password: ""
+  # GeoIP database
+  #geoip_database: ""
   # Users to show as being nearby
   nearby_users: 30
   # Max radius, in km, for nearby users
@@ -92,6 +94,8 @@ defaults: &defaults
     - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
     # Blacklist VWorld
     - "http://xdworld\\.vworld\\.kr:8080/.*"
+    # Blacklist here
+    - ".*\\.here\\.com[/:].*"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
   # Routing endpoints