glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

s3 over https by default

Browse source
This commit is contained in:
Devin Howard 2015-12-20 20:19:09 +08:00
parent e2bf1d5eb1
commit f35d4d51a9
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
config/environments/development.rb
View file

@ -15,12 +15,13 @@ Metamaps::Application.configure do
# S3 file storage # S3 file storage
config.paperclip_defaults = { config.paperclip_defaults = {
:storage => :s3, storage: :s3,
:s3_credentials => { :s3_credentials: {
:bucket => ENV['S3_BUCKET_NAME'], bucket: ENV['S3_BUCKET_NAME'],
:access_key_id => ENV['AWS_ACCESS_KEY_ID'], access_key_id: ENV['AWS_ACCESS_KEY_ID'],
:secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'] secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
} },
s3_protocol: 'https'
} }
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp

11
config/environments/production.rb
View file

@ -24,11 +24,12 @@ Metamaps::Application.configure do
# S3 file storage # S3 file storage
config.paperclip_defaults = { config.paperclip_defaults = {
:storage => :s3, :storage => :s3,
:s3_credentials => { s3_credentials: {
:bucket => ENV['S3_BUCKET_NAME'], bucket: ENV['S3_BUCKET_NAME'],
:access_key_id => ENV['AWS_ACCESS_KEY_ID'], access_key_id: ENV['AWS_ACCESS_KEY_ID'],
:secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'] secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
} },
s3_protocol: 'https'
} }
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp