Merge branch 'pull/4985'

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

diff --git a/config/initializers/canonical_rails.rb b/config/initializers/canonical_rails.rb
index 0d1461ed7b153758d893a1216a602a3f9ef792e8..c2c8440476adae5375cdc4713eeb9edd6bb70e89 100644 (file)
--- 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.
 
 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.
 
 
   # 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;
 
   # http://en.wikipedia.org/wiki/URL_normalization
   # Trailing slash represents semantics of a directory, ie a collection view - implying an :index get route;