From bf8959cdc2e65e18dc3a0eb4d7fe32d38dfd4498 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 22 Mar 2017 18:22:24 +0000 Subject: [PATCH] Add server_protocol configuration option --- config/example.application.yml | 7 +++---- config/initializers/canonical_rails.rb | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config/example.application.yml b/config/example.application.yml index 73089394f..567458c90 100644 --- 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 314826add..c443c8bf8 100644 --- 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. -- 2.45.1