Merge remote-tracking branch 'upstream/pull/4690'

[rails.git] / config / initializers / canonical_rails.rb

diff --git a/config/initializers/canonical_rails.rb b/config/initializers/canonical_rails.rb
index 314826add81d9ff6018922f7fc180d7d3040fc62..c2c8440476adae5375cdc4713eeb9edd6bb70e89 100644 (file)
--- a/config/initializers/canonical_rails.rb
+++ b/config/initializers/canonical_rails.rb
@@ -1,11 +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#= 'https://'
+  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.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;