X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c672a73de3f376d0981c5bec9cdc3e97d5d0f9b7..1a20044dc7e5baaf836edae1a0631d7d34e76854:/config/initializers/active_storage.rb diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb index 361e2edee..6bcaf895f 100644 --- a/config/initializers/active_storage.rb +++ b/config/initializers/active_storage.rb @@ -2,35 +2,5 @@ Rails.application.config.active_storage.queues.analysis = :storage Rails.application.config.active_storage.queues.purge = :storage Rails.configuration.after_initialize do - require "active_storage/service/s3_service" - require_dependency "active_storage/variant" - - module OpenStreetMap - module ActiveStorage - module Variant - private - - def upload(image) - File.open(image.path, "r") { |file| service.upload(key, file, :content_type => content_type) } - end - end - - module S3Service - def upload(key, io, content_type:, **options) - @upload_options[:content_type] = content_type - super(key, io, **options) - @upload_options.delete(:content_type) - end - end - end - end - - ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant) - ActiveStorage::Service::S3Service.prepend(OpenStreetMap::ActiveStorage::S3Service) - - ActiveSupport::Reloader.to_complete do - ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant) - end - ActiveStorage.service_urls_expire_in = 1.week end