Set canonical port based on protocol

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

diff --git a/config/example.application.yml b/config/example.application.yml
index 73089394f94b80b024d129dc1bafefc426426bec..45c0a39c4aca3cfbd1d3be77e79d6f2d3d222f76 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:
@@ -130,8 +133,6 @@ production:
 
 test:
   <<: *defaults
-  # Server URL for testing
-  server_url: "openstreetmap.example.com"
   # Geonames credentials for testing
   geonames_username: "dummy"
   # External authentication credentials for testing