Merge branch 'master' of github.com:sterrym/smithycms

sterrym · Jan 27, 2016 · dfdecb4 · dfdecb4
2 parents 138a463 + 7973644
commit dfdecb4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/layouts/smithy/shared/_footer.html.erb b/app/views/layouts/smithy/shared/_footer.html.erb
@@ -1,3 +1,3 @@
 <footer id="footer">
-  Carefully crafted by <a href="http://www.tag.ca">Tag Solutions</a>
+  Carefully crafted by <a href="http://www.tagstudios.io">Tag Digital Studios</a>
 </footer>
diff --git a/lib/smithy/dragonfly/asset_helper.rb b/lib/smithy/dragonfly/asset_helper.rb
@@ -30,7 +30,7 @@ def dragonfly_datastore
                 /#{ENV['AWS_S3_BUCKET']}\.s3\.amazonaws\.com/
               ]
             end
-            ::Dragonfly::S3DataStore.new(bucket_name: ENV['AWS_S3_BUCKET'], access_key_id: ENV['AWS_ACCESS_KEY_ID'], secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'], url_scheme: 'https')
+            ::Dragonfly::S3DataStore.new(bucket_name: ENV['AWS_S3_BUCKET'], access_key_id: ENV['AWS_ACCESS_KEY_ID'], secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'], region: ENV['AWS_S3_REGION'], url_scheme: 'https')
           else
             Dragonfly.app.configure { fetch_url_whitelist [] }
             ::Dragonfly::FileDataStore.new(root_path: Rails.root.join('public/system/dragonfly', Rails.env), server_root: Rails.root.join('public'))