Making changes to project settings

Author: andrewmp1

.env.example

@@ -0,0 +1,2 @@
+S3_KEY=KEY
+S3_SECRET=SECRET

.gitignore

@@ -14,3 +14,5 @@
 /log/*.log
 /tmp
 .idea
+/config/database.yml
+/config/services.yml

Gemfile

@@ -33,6 +33,7 @@ gem 'cancan'
 
 gem 'carrierwave', '0.5.8'
 gem 'fog', '0.9.0'
+gem 'foreman'
 
 gem 'simple_form'
 

Gemfile.lock

@@ -90,6 +90,8 @@ GEM
       net-ssh (>= 2.1.4)
       nokogiri (>= 1.4.4)
       ruby-hmac
+    foreman (0.46.0)
+      thor (>= 0.13.6)
     formatador (0.2.1)
     gherkin (2.9.3)
       json (>= 1.4.6)
@@ -231,6 +233,7 @@ DEPENDENCIES
   devise
   factory_girl
   fog (= 0.9.0)
+  foreman
   guard
   heroku
   jquery-rails

Procfile

@@ -0,0 +1 @@
+web: rails s thin

config/database.yml config/database.yml.example

@@ -3,13 +3,9 @@ development:
   encoding: unicode
   database: wallet
   pool: 5
-  username: j
-  password: 
 
 test:
   adapter: postgresql
   encoding: unicode
   database: wallet
-  pool: 5
-  username: j
-  password: 
+  pool: 5

config/initializers/fog.rb

@@ -1,8 +1,8 @@
 CarrierWave.configure do |config|
   config.fog_credentials = {
     :provider               => 'AWS',       # required
-    :aws_access_key_id      => 'AKIAINJ6HA3PY44KIGZA',       # required
-    :aws_secret_access_key  => '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'    # required
+    :aws_access_key_id      => ENV['S3_KEY'],       # required
+    :aws_secret_access_key  => ENV['S3_SECRET']    # required
     # :region                 => 'eu-west-1'  # optional, defaults to 'us-east-1'
   }
   config.fog_directory  = 'renters-wallet-documents'                     # required

config/initializers/s3.rb

@@ -0,0 +1,6 @@
+require 'yaml'
+if !Rails.env.production?
+  config = YAML.load_file(Rails.root.join("config", "services.yml"))
+  ENV['S3_KEY'] = config["s3"]["key"]
+  ENV['S3_SECRET'] = config["s3"]["secret"]
+end

config/services.yml.example

@@ -0,0 +1,3 @@
+s3:
+  key: key
+  secret: secret