From fa8df410dab66faba94e018c0745bb484eebfade Mon Sep 17 00:00:00 2001 From: Chris Doughty Date: Thu, 12 Dec 2013 20:47:20 -0600 Subject: [PATCH] VRFS-719 Added code to force downloads through cloudfront --- web/app/controllers/artifacts_controller.rb | 3 ++- web/config/application.rb | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/app/controllers/artifacts_controller.rb b/web/app/controllers/artifacts_controller.rb index 45c74c832..180f12286 100644 --- a/web/app/controllers/artifacts_controller.rb +++ b/web/app/controllers/artifacts_controller.rb @@ -51,11 +51,12 @@ class ArtifactsController < ApiController end def determine_url(artifact) + if SampleApp::Application.config.storage_type == :file # this is basically a dev-time only path of code; we store real artifacts in s3 url = SampleApp::Application.config.jam_admin_root_url + artifact.uri.url else - url = artifact.uri.url + url = artifact.uri.url.gsub(SampleApp::Application.config.aws_fullhost,SampleApp::Application.config.cloudfront_host) end return url diff --git a/web/config/application.rb b/web/config/application.rb index 03afc6ec8..606adebb8 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -122,6 +122,10 @@ if defined?(Bundler) config.aws_bucket = 'jamkazam-dev' config.aws_bucket_public = 'jamkazam-dev-public' config.aws_cache = '315576000' + config.aws_fullhost = "#{config.aws_bucket_public}.s3.amazonaws.com" + + # cloudfront host + config.cloudfront_host = "d34f55ppvvtgi3.cloudfront.net" # facebook keys config.facebook_key = '468555793186398'