Fix with no paperclip patch

otwcode · Mar 2, 2024 · cec0054 · cec0054
1 parent 9858bcf
commit cec0054
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/app/models/collection.rb b/app/models/collection.rb
@@ -8,8 +8,6 @@ class Collection < ApplicationRecord
   path: %w(staging production).include?(Rails.env) ? ":class/:attachment/:id/:style.:extension" : ":rails_root/public:url",
   storage: %w(staging production).include?(Rails.env) ? :s3 : :filesystem,
   s3_protocol: "https",
-  s3_credentials: "#{Rails.root}/config/s3.yml",
-  bucket: %w(staging production).include?(Rails.env) ? YAML.load_file("#{Rails.root}/config/s3.yml")['bucket'] : "",
   default_url: "/images/skins/iconsets/default/icon_collection.png"
 
   validates_attachment_content_type :icon, content_type: /image\/\S+/, allow_nil: true

diff --git a/app/models/pseud.rb b/app/models/pseud.rb
@@ -14,8 +14,6 @@ class Pseud < ApplicationRecord
           end,
     storage: %w(staging production).include?(Rails.env) ? :s3 : :filesystem,
     s3_protocol: "https",
-    s3_credentials: "#{Rails.root}/config/s3.yml",
-    bucket: %w(staging production).include?(Rails.env) ? YAML.load_file("#{Rails.root}/config/s3.yml")['bucket'] : "",
     default_url: "/images/skins/iconsets/default/icon_user.png"
 
   validates_attachment_content_type :icon,

diff --git a/app/models/skin.rb b/app/models/skin.rb
@@ -54,8 +54,6 @@ class Skin < ApplicationRecord
                     path: %w(staging production).include?(Rails.env) ? ":class/:attachment/:id/:style.:extension" : ":rails_root/public:url",
                     storage: %w(staging production).include?(Rails.env) ? :s3 : :filesystem,
                     s3_protocol: "https",
-                    s3_credentials: "#{Rails.root}/config/s3.yml",
-                    bucket: %w(staging production).include?(Rails.env) ? YAML.load_file("#{Rails.root}/config/s3.yml")['bucket'] : "",
                     default_url: "/images/skins/iconsets/default/icon_skins.png"
 
   after_save :skin_invalidate_cache

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -109,6 +109,13 @@
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
+  # paperclip config
+  Paperclip::Attachment.default_options[:storage] = :s3
+  Paperclip::Attachment.default_options[:s3_credentials] = { s3_region: ENV['S3_REGION'] ,
+                                                             bucket: ENV['S3_BUCKET'] ,
+                                                             access_key_id:  ENV['S3_ACCESS_KEY_ID'] ,
+                                                             secret_access_key:  ENV['S3_SECRET_ACCESS_KEY']  }
+
   # Inserts middleware to perform automatic connection switching.
   # The `database_selector` hash is used to pass options to the DatabaseSelector
   # middleware. The `delay` is used to determine how long to wait after a write

diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -68,6 +68,12 @@
     Bullet.counter_cache_enable = false
   end
 
+  Paperclip::Attachment.default_options[:storage] = :s3
+  Paperclip::Attachment.default_options[:s3_credentials] = { s3_region: ENV['S3_REGION'] , 
+                                                             bucket: ENV['S3_BUCKET'] ,
+                                                             access_key_id:  ENV['S3_ACCESS_KEY_ID'] ,
+                                                             secret_access_key:  ENV['S3_SECRET_ACCESS_KEY']  }
+
   config.middleware.use Rack::Attack
 
   # Disable dumping schemas after migrations.