Merge pull request #4552 from alphagov/asset-host

Switch asset path and host

Author: kevindew

config/application.rb

@@ -44,7 +44,11 @@ class Application < Rails::Application
     config.filter_parameters += [:password]
 
     # Path within public/ where assets are compiled to
-    config.assets.prefix = "/smartanswers"
+    config.assets.prefix = "/assets/smartanswers"
+
+    # allow overriding the asset host with an enironment variable, useful for
+    # when router is proxying to this app but asset proxying isn't set up.
+    config.asset_host = ENV["ASSET_HOST"]
 
     # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
     config.assets.precompile += %w[

config/environments/development.rb

@@ -36,10 +36,6 @@
   # number of complex assets.
   config.assets.debug = true
 
-  if ENV["GOVUK_ASSET_ROOT"].present?
-    config.asset_host = ENV["GOVUK_ASSET_ROOT"]
-  end
-
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 

config/environments/production.rb

@@ -30,9 +30,6 @@
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
   # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
@@ -61,8 +58,6 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  config.action_controller.asset_host = ENV["GOVUK_ASSET_HOST"]
-
   if ENV["RUNNING_ON_HEROKU"]
     # flush output to the underlying OS without buffering
     STDOUT.sync = true

config/initializers/slimmer.rb

@@ -1,7 +1,3 @@
 SmartAnswers::Application.configure do
   config.slimmer.logger = Rails.logger
-
-  if Rails.env.development?
-    config.slimmer.asset_host = ENV["STATIC_DEV"] || Plek.new.find("static")
-  end
 end