ssl s3, attrs
This commit is contained in:
parent
0c8aca3ef8
commit
995d285fdd
4 changed files with 6 additions and 5 deletions
2
Gemfile
2
Gemfile
|
|
@ -34,7 +34,7 @@ gem 'thin', '1.2.7', :require => false
|
|||
gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
|
||||
|
||||
#File uploading
|
||||
gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
|
||||
gem 'carrierwave', :git => 'git://github.com/recruitmilitary/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
|
||||
gem 'mini_magick', '3.2'
|
||||
gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
|
||||
gem 'fastercsv', '1.5.4', :require => false
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ GIT
|
|||
simple_oauth (~> 0.1.2)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rsofaer/carrierwave.git
|
||||
revision: a42dfa25023775be82d7eb9bc9edb675986b1f40
|
||||
remote: git://github.com/recruitmilitary/carrierwave.git
|
||||
revision: a30bb2603a51b646fd771065d6c203abef2e936e
|
||||
branch: master
|
||||
specs:
|
||||
carrierwave (0.5.0)
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ class Photo < Post
|
|||
xml_attr :remote_photo_path
|
||||
xml_attr :remote_photo_name
|
||||
|
||||
xml_reader :caption
|
||||
xml_reader :status_message_id
|
||||
xml_attr :caption
|
||||
xml_attr :status_message_id
|
||||
|
||||
belongs_to :status_message
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ CarrierWave.configure do |config|
|
|||
config.s3_access_key_id = AppConfig[:s3_key]
|
||||
config.s3_secret_access_key = AppConfig[:s3_secret]
|
||||
config.s3_bucket = AppConfig[:s3_bucket]
|
||||
config.s3_use_ssl = true
|
||||
config.cache_dir = "#{Rails.root}/tmp/uploads"
|
||||
else
|
||||
config.storage = :file
|
||||
|
|
|
|||
Loading…
Reference in a new issue