Merge remote branch 'stevenheidel/master'

rgo · Jul 21, 2010 · a4a2cec · a4a2cec
2 parents 3cbe582 + 7453c36
commit a4a2cec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/config/amazon_s3.yml.example b/config/amazon_s3.yml.example
@@ -1,6 +1,6 @@
 login: &login
-  access_key_id: 
-  secret_access_key: 
+  access_key_id: <%= ENV['S3_KEY'] %>
+  secret_access_key: <%= ENV['S3_SECRET'] %>
 
 development:
   bucket_name: your_local_amazon_s3

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -21,7 +21,7 @@
 # is going on but without being chatty and therefore slow.
 config.log_level = :info
 
-# Set to true in order to use Amazon's Simple Storage Service on your production machine
+# When true will use Amazon's Simple Storage Service on your production machine
 # instead of the default file system for resources and images
 # Make sure to your bucket info is correct in amazon_s3.yml
-Refinery.s3_backend = false
+Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
diff --git a/config/rackspace_cloudfiles.yml.example b/config/rackspace_cloudfiles.yml.example
@@ -1,14 +1,15 @@
+login: &login
+  username: <%= ENV['RACKSPACE_USERNAME'] %>
+  api_key: <%= ENV['RACKSPACE_KEY'] %>
+
 development:
-    container_name: your_local_rackspace_cloudfiles
-    username:
-    api_key: 
+  container_name: your_local_rackspace_cloudfiles
+  <<: *login 
 
 test:
-    container_name: your_test_rackspace_cloudfiles
-    username: 
-    api_key: 
+  container_name: your_test_rackspace_cloudfiles
+  <<: *login 
 
 production:
-    container_name: your_production_rackspace_cloudfiles
-    username: 
-    api_key: 
+  container_name: your_production_rackspace_cloudfiles
+  <<: *login