Add server_protocol configuration option

diff --git a/config/example.application.yml b/config/example.application.yml
index 73089394f94b80b024d129dc1bafefc426426bec..567458c902f5ce7bf011087c33ca6397b6f9be9b 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -1,6 +1,7 @@
 defaults: &defaults
-  # The server URL
-  #server_url: "www.openstreetmap.org"
+  # The server protocol and host
+  server_protocol: "http"
+  server_url: "openstreetmap.example.com"
   # The generator
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
@@ -130,8 +131,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

diff --git a/config/initializers/canonical_rails.rb b/config/initializers/canonical_rails.rb
index 314826add81d9ff6018922f7fc180d7d3040fc62..c443c8bf816461d99b77043a5bd4416d62c13323 100644 (file)
--- a/config/initializers/canonical_rails.rb
+++ b/config/initializers/canonical_rails.rb
@@ -1,7 +1,7 @@
 CanonicalRails.setup do |config|
   # Force the protocol. If you do not specify, the protocol will be based on the incoming request's protocol.
 
-  # config.protocol#= 'https://'
+  config.protocol = "#{SERVER_PROTOCOL}://"
 
   # This is the main host, not just the TLD, omit slashes and protocol. If you have more than one, pick the one you want to rank in search results.