Merge branch 'baserock/adamcoldrick/gitlab-systems-merge'

Reviewed by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>

1 files changed, 49 insertions, 0 deletions

diff --git a/gitlab-server/usr/share/gitlab-install/gitlab/config/database.yml b/gitlab-server/usr/share/gitlab-install/gitlab/config/database.yml
new file mode 100644
index 00000000..66960551
--- /dev/null
+++ b/gitlab-server/usr/share/gitlab-install/gitlab/config/database.yml
@@ -0,0 +1,49 @@
+#
+# PRODUCTION
+#
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: gitlabhq_production
+  pool: 10
+  # username: git
+  # password:
+  # host: localhost
+  # port: 5432 
+  # socket: /tmp/postgresql.sock
+
+#
+# Development specific
+#
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: gitlabhq_development
+  pool: 5
+  username: postgres
+  password:
+  # socket: /tmp/postgresql.sock
+
+#
+# Staging specific
+#
+staging:
+  adapter: postgresql
+  encoding: unicode
+  database: gitlabhq_staging
+  pool: 5
+  username: postgres
+  password:
+  # socket: /tmp/postgresql.sock
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
+  adapter: postgresql
+  encoding: unicode
+  database: gitlabhq_test
+  pool: 5
+  username: postgres
+  password:
+  # socket: /tmp/postgresql.sock