nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "added configuration for cloudfile cdn"

Browse source 
This reverts commit 0d5ac3bd36.
This commit is contained in:
danielvincent 2010-12-17 14:30:02 -08:00
parent 0d5ac3bd36
commit 6afb7a6bd5
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/app_config.yml.example
View file

@ -80,10 +80,6 @@ default:
cloudfiles_api_key: 'abc123'
invites_off: false
#cloudfiles bucket and CDN for photo uploads
#cloudfiles_bucket: 'example_bucket'
#cloudfiles_cdn_url: 'http://xxxxxx.cdn.rackspacecloud.com'
development:
test:

13
config/initializers/carrierwave.rb
View file

@ -8,19 +8,6 @@ CarrierWave.configure do |config|
config.s3_access_key_id = ENV['S3_KEY']
config.s3_secret_access_key = ENV['S3_SECRET']
config.s3_bucket = ENV['S3_BUCKET']
config.cache_dir = "#{Rails.root}/tmp/uploads"
elsif ENV['CLOUDFILES_USERNAME'] && ENV['CLOUDFILES_KEY'] && ENV['CLOUDFILES_BUCKET']
config.storage = :cloud_files
config.cloud_files_username = ENV['CLOUDFILES_USERNAME']
config.cloud_files_api_key = ENV['CLOUDFILES_KEY']
config.cloud_files_container = ENV['CLOUDFILES_BUCKET']
# providing the CDN url means carrierwave does not have to resolve it
# on every upload request.
if ENV['CLOUDFILES_CDN_URL']
config.cloud_files_cdn_host = ENV['CLOUDFILES_CDN_URL']
end
config.cache_dir = "#{Rails.root}/tmp/uploads"
else
config.storage = :file