X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..ea92d66cc0668246f026c5d5394d53180be040c3:/config/initializers/canonical_rails.rb diff --git a/config/initializers/canonical_rails.rb b/config/initializers/canonical_rails.rb index 0d1461ed7..c2c844047 100644 --- a/config/initializers/canonical_rails.rb +++ b/config/initializers/canonical_rails.rb @@ -1,12 +1,12 @@ 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 = "#{SERVER_PROTOCOL}://" + config.protocol = "#{Settings.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. - config.host = SERVER_URL - config.port = SERVER_PROTOCOL == "https" ? 443 : 80 + config.host = Settings.server_url + config.port = Settings.server_protocol == "https" ? 443 : 80 # http://en.wikipedia.org/wiki/URL_normalization # Trailing slash represents semantics of a directory, ie a collection view - implying an :index get route;