NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixup: remove image.host from Settings

Browse source
This commit is contained in:
Kasia Jarmołkowicz 2018-05-22 11:26:48 +02:00 committed by Eric Schultz
parent 546b37f098
commit e6aa64cb52
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/carrierwave.rb
View file

@ -4,7 +4,7 @@ CarrierWave.configure do |config|
config.storage = :aws config.storage = :aws
config.aws_bucket = Settings.aws.bucket config.aws_bucket = Settings.aws.bucket
config.aws_acl = :public_read config.aws_acl = :public_read
config.asset_host = Settings.image&.host || "https://s3-#{Settings.aws.region}.amazonaws.com/#{Settings.aws.bucket}" config.asset_host = Settings.image&.host || "https://#{Settings.aws.bucket}.s3.amazonaws.com"
config.aws_authenticated_url_expiration = 60 * 60 * 24 * 365 config.aws_authenticated_url_expiration = 60 * 60 * 24 * 365
config.aws_credentials = { config.aws_credentials = {
access_key_id: Settings.aws.access_key_id, access_key_id: Settings.aws.access_key_id,

3
config/settings.yml
View file

@ -22,9 +22,6 @@ aws:
secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
bucket: <%= ENV['S3_BUCKET_NAME'] %> bucket: <%= ENV['S3_BUCKET_NAME'] %>
image:
host: "https://#{Settings.aws.bucket}.s3.amazonaws.com"
mailer: mailer:
delivery_method: "sendmail" delivery_method: "sendmail"
address: "localhost" address: "localhost"