Use current_user to represent the currently logged in user.

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 73089394f94b80b024d129dc1bafefc426426bec..9c5c7a180ca3fb7eb3ee2ffeb1baef6e51861272 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,16 +1,19 @@
 defaults: &defaults
 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
   # 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
   # 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:
   # API version
   api_version: "0.6"
   # Application status - possible values are:


@@ -92,6 +95,8 @@ defaults: &defaults
     - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
     # Blacklist VWorld
     - "http://xdworld\\.vworld\\.kr:8080/.*"
     - ".*\\.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
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
   # Routing endpoints


@@ -130,8 +135,6 @@ production:
 
 test:
   <<: *defaults
 
 test:
   <<: *defaults

-  # Server URL for testing
-  server_url: "openstreetmap.example.com"

   # Geonames credentials for testing
   geonames_username: "dummy"
   # External authentication credentials for testing
   # Geonames credentials for testing
   geonames_username: "dummy"
   # External authentication credentials for testing