From e6aa64cb52f895d0663a8bb314daf2e94256000b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasia=20Jarmo=C5=82kowicz?= Date: Tue, 22 May 2018 11:26:48 +0200 Subject: [PATCH] Fixup: remove image.host from Settings --- config/initializers/carrierwave.rb | 2 +- config/settings.yml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 59b7bfc0..18e4d95b 100755 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -4,7 +4,7 @@ CarrierWave.configure do |config| config.storage = :aws config.aws_bucket = Settings.aws.bucket 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_credentials = { access_key_id: Settings.aws.access_key_id, diff --git a/config/settings.yml b/config/settings.yml index f6a5c812..9dfbfa19 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -22,9 +22,6 @@ aws: secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> bucket: <%= ENV['S3_BUCKET_NAME'] %> -image: - host: "https://#{Settings.aws.bucket}.s3.amazonaws.com" - mailer: delivery_method: "sendmail" address: "localhost"