From 680fc90e8b36b64deefe9fd0804b39b06015f9f9 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 15 Jan 2015 16:13:24 +0200
Subject: [PATCH] Updated deploy, readme and database

---
 README.md                   |  6 +++---
 config/database-example.yml | 22 +++++++++-------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 8b7eca0d7..db3b4cb00 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Manual demo install and database setup:
     cd /home/registry
     git clone git@github.com:internetee/registry.git demo-registry
     cd demo-registry
-    rbenv local 2.1.2
+    rbenv local 2.2.0
     bundle
     cp config/database-example.yml config/database.yml # and edit it
     cp config/secrets-example.yml config/secrets.yml # and edit it, generate key with 'rake secret'
@@ -48,7 +48,7 @@ Production install (database schema should be loaded and seeds should be present
     # at your local machine
     git clone git@github.com:internetee/registry.git
     cd registry
-    rbenv local 2.1.2 # more info about rbenv at debian doc
+    rbenv local 2.2.0 # more info about rbenv at debian doc
     gem install mina
     mina pr setup # one time, only creates missing directories
     ssh registry
@@ -108,7 +108,7 @@ For Apache, registry admin goes to port 443 in production, /etc/apache2/sites-en
   DocumentRoot /home/registry/registry/current/public
   
 	# Possible values include: debug, info, notice, warn, error, crit,
-  LogLevel info ssl:warn
+  LogLevel info
   ErrorLog /var/log/apache2/registry.error.log
   CustomLog /var/log/apache2/registry.access.log combined
   
diff --git a/config/database-example.yml b/config/database-example.yml
index 7c28d927e..5f708f07b 100644
--- a/config/database-example.yml
+++ b/config/database-example.yml
@@ -6,30 +6,26 @@ default: &default
   username: registry
   password: registry_pwd
 
+
 development:
   <<: *default
   database: registry_development
 
+development:
+  <<: *default
+  database: registry_whois_development
+
+
 test:
   <<: *default
   database: registry_test
 
+
 production:
   <<: *default
   database: registry_production
 
-development_private_whois:
+production:
   <<: *default
-  database: whois_private
+  database: registry_whois_production
 
-development_private_whois:
-  <<: *default
-  database: whois_public
-
-production_public_whois:
-  <<: *default
-  database: production_whois_public
-
-production_private_whois:
-  <<: *default
-  database: production_whois_private