From c21d5cc3dc9f6786a770640e55df99e39567dce6 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 6 Jun 2014 12:26:30 +1000 Subject: [PATCH] Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors. --- app/controllers/application_controller.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 07e1029991..decc48ac7e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery - before_filter :require_certified_hostname include EnterprisesHelper @@ -17,6 +16,7 @@ class ApplicationController < ActionController::Base end end + private def require_distributor_chosen @@ -42,17 +42,6 @@ class ApplicationController < ActionController::Base end end - # There are several domains that point to the production server, but only one - # (vic.openfoodnetwork.org) that has the SSL certificate. Redirect all requests to this - # domain to avoid showing customers a scary invalid certificate error. - def require_certified_hostname - certified_host = "openfoodnetwork.org.au" - - if Rails.env.production? && request.host != certified_host - redirect_to "http://#{certified_host}#{request.fullpath}" - end - end - # All render calls within the block will be performed with the specified format # Useful for rendering html within a JSON response, particularly if the specified