Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 0 deletions

diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index a4daab1fd0c..5329a8e9fd7 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -18,6 +18,13 @@ production:
     #     port: 8600
     #     record: secondary.postgresql.service.consul
     #     interval: 300
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_production
+    username: git
+    password: "secure password"
+    host: localhost
 
 #
 # Development specific
@@ -32,6 +39,13 @@ development:
     host: localhost
     variables:
       statement_timeout: 15s
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_development
+    username: postgres
+    password: "secure password"
+    host: localhost
 
 #
 # Staging specific
@@ -44,6 +58,13 @@ staging:
     username: git
     password: "secure password"
     host: localhost
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_staging
+    username: git
+    password: "secure password"
+    host: localhost
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -59,3 +80,10 @@ test: &test
     prepared_statements: false
     variables:
       statement_timeout: 15s
+  geo:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_geo_test
+    username: postgres
+    password:
+    host: localhost