From 03dce1b663859a6ebb52645d2d9330ce68ad6d76 Mon Sep 17 00:00:00 2001
From: ciscou <francismpp@gmail.com>
Date: Tue, 10 Dec 2013 00:31:28 +0100
Subject: [PATCH] adding (encrypted) s3 credentials to travis

---
 .travis.yml                        | 6 +++++-
 config/initializers/carrierwave.rb | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bab46c5..87ed5e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 language: ruby
 before_script:
   - psql -c 'create database cpp_development;' -U postgres
-  - mv config/s3.yml.example config/s3.yml
 rvm:
   - 2.0.0
+env:
+  global:
+  - secure: GiQTAiHHfD27FPk0/jV5dZIrHK+refypoxwnXe5MLOB5ND2ZupGKzPFcO7E5VcIdnIwX1+UNVj9crv8YdNnyaRozuLuBVWGtfzJP8C4J4ZOarr0UMyhyAz4JvbbkT1oGrL8xkpZ+u4JQWvxJbzEGExv/8mPkgHbxdr5izMX3QNo=
+  - secure: YuNUEmbW94JFwBDayoStaM43RG72th9cP6/fFFvUFKJ0Qm7Rw5OXFU5ypqwOSvQFhNBuRZmME4fxgejZQ7ojuevZwX515Zm/ZD0BUGSbY3Vz4BS2vqeMGPX93F0IaC3XFnW7RgViWQ1H+XV9RwIFC3+JJhE4aKDR0Gr2pkhlhCs=
+  - S3_BUCKET=ceramicapadilladev
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 121b7a1..d2a31ea 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,4 +1,6 @@
-S3_CONFIG = if Rails.env.production?
+S3_CONFIG = if File.exists? Rails.root.join("config", "s3.yml")
+              YAML.load_file Rails.root.join("config", "s3.yml")
+            else
               {
                 "fog_credentials" => {
                   "provider"              => 'AWS',
@@ -7,8 +9,6 @@
                 },
                 "fog_directory" => ENV["S3_BUCKET"]
               }
-            else
-              YAML.load_file Rails.root.join("config", "s3.yml")
             end
 S3_CONFIG.symbolize_keys!