now pulls S3_BUCKET config from the environment, or the s3.yml file

jgilliam · Dec 4, 2009 · ae10c0b · ae10c0b
1 parent 82bc4d5
commit ae10c0b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/models/government.rb b/app/models/government.rb
@@ -18,23 +18,23 @@ class Government < ActiveRecord::Base
 
   has_attached_file :logo, :styles => { :icon_96 => "96x96#", :icon_140  => "140x140#", :icon_180 => "180x180#", :medium => "450x" }, 
     :storage => :s3, :s3_credentials => S3_CONFIG, 
-    :path => ":class/:attachment/:id/:style.:extension", :bucket => ENV['DOMAIN']
+    :path => ":class/:attachment/:id/:style.:extension", :bucket => S3_CONFIG["bucket"]
 
   validates_attachment_size :logo, :less_than => 5.megabytes
   validates_attachment_content_type :logo, :content_type => ['image/jpeg', 'image/png', 'image/gif']
 
   belongs_to :buddy_icon_old, :class_name => "Picture"
   has_attached_file :buddy_icon, :styles => { :icon_24 => "24x24#", :icon_48  => "48x48#", :icon_96 => "96x96#" }, 
     :storage => :s3, :s3_credentials => S3_CONFIG, :default_url => "/images/buddy_:style.png",
-    :path => ":class/:attachment/:id/:style.:extension", :bucket => ENV['DOMAIN']
+    :path => ":class/:attachment/:id/:style.:extension", :bucket => S3_CONFIG["bucket"]
 
   validates_attachment_size :buddy_icon, :less_than => 5.megabytes
   validates_attachment_content_type :buddy_icon, :content_type => ['image/jpeg', 'image/png', 'image/gif']    
 
   belongs_to :fav_icon_old, :class_name => "Picture"
   has_attached_file :fav_icon, :styles => { :icon_16 => "16x16#" }, 
     :storage => :s3, :s3_credentials => S3_CONFIG, :default_url => "/favicon.png",
-    :path => ":class/:attachment/:id/:style.:extension", :bucket => ENV['DOMAIN']
+    :path => ":class/:attachment/:id/:style.:extension", :bucket => S3_CONFIG["bucket"]
 
   validates_attachment_size :fav_icon, :less_than => 5.megabytes
   validates_attachment_content_type :fav_icon, :content_type => ['image/jpeg', 'image/png', 'image/gif']  

diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -8,7 +8,7 @@ class Partner < ActiveRecord::Base
 
   has_attached_file :logo, :styles => { :icon_96 => "96x96#", :icon_140 => "140x140#", :icon_180 => "180x180#", :medium  => "450x" }, 
     :storage => :s3, :s3_credentials => S3_CONFIG, 
-    :path => ":class/:attachment/:id/:style.:extension", :bucket => ENV['DOMAIN']
+    :path => ":class/:attachment/:id/:style.:extension", :bucket => S3_CONFIG["bucket"]
 
   validates_attachment_size :logo, :less_than => 5.megabytes
   validates_attachment_content_type :logo, :content_type => ['image/jpeg', 'image/png', 'image/gif']

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -46,7 +46,7 @@ class User < ActiveRecord::Base
   belongs_to :picture
   has_attached_file :buddy_icon, :styles => { :icon_24 => "24x24#", :icon_48 => "48x48#", :icon_96 => "96x96#" }, 
     :storage => :s3, :s3_credentials => S3_CONFIG, :default_url => "/images/buddy_:style.png",
-    :path => ":class/:attachment/:id/:style.:extension", :bucket => ENV['DOMAIN']
+    :path => ":class/:attachment/:id/:style.:extension", :bucket => S3_CONFIG["bucket"]
 
   validates_attachment_size :buddy_icon, :less_than => 5.megabytes
   validates_attachment_content_type :buddy_icon, :content_type => ['image/jpeg', 'image/png', 'image/gif']

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -37,5 +37,5 @@
 end
 
 if ENV['S3_ACCESS_KEY_ID']
-  S3_CONFIG = { 'access_key_id' => ENV['S3_ACCESS_KEY_ID'], 'secret_access_key' => ENV['S3_SECRET_ACCESS_KEY'] }
+  S3_CONFIG = { 'access_key_id' => ENV['S3_ACCESS_KEY_ID'], 'secret_access_key' => ENV['S3_SECRET_ACCESS_KEY'], 'bucket' => ENV['S3_BUCKET'] }
 end