From a75d97dd2e9a6c7e375036684b0997d63bdc2c01 Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Tue, 22 Mar 2016 13:03:03 -0300
Subject: [PATCH] igore database.yml and sidekiq.yml files

---
 .gitignore | 5 +++++
 README.md  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8046438f..05b8fd85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ Gemfile.lock
 /public/assets
 /config/orientdb.yml
 /config/dspace.yml
+
 # ignore server scripts
 puma.sh
 start_puma.sh
@@ -30,3 +31,7 @@ portalmec.service
 portalmec-sidekiq.service
 sidekiq.sh
 autocomplete-server.service
+
+# ignore configs
+/config/database.yml
+/config/sidekiq.yml
\ No newline at end of file
diff --git a/README.md b/README.md
index c97791ff..e601b62d 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ After this setup, open the config files and update some vars:
     #### Using docker for development env
     You can use docker for your development environment. For that, run:
     ``` ./bin/docker-setup ```
-    Now, redis, elasticsearch and postgres are running as services and linked to PortalMEC application. Database migrations were execute.
+    Now, redis, elasticsearch and postgres are running as services and linked to PortalMEC application. Database migrations were execute and the configs (database.yml, sidekiq.yml was replaced by config/docker/...).
 
 If all development and test vars are set, run:
 ``` ./bin/setup ```
-- 
GitLab