[DRE-commits] [diaspora] 136/257: install database.yml

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit f979862f20ab4f53769f1447db0365cbe649d0e4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Nov 24 03:47:47 2014 +0530

    install database.yml
---
 debian/database.yml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/install      |  1 +
 2 files changed, 55 insertions(+)

diff --git a/debian/database.yml b/debian/database.yml
new file mode 100644
index 0000000..e1a81a7
--- /dev/null
+++ b/debian/database.yml
@@ -0,0 +1,54 @@
+mysql: &mysql
+  adapter: mysql2
+  host: "localhost"
+  port: 3306
+  username: "root"
+  password: ""
+#  socket: /tmp/mysql.sock
+  charset: utf8
+  collation: utf8_bin
+
+postgres: &postgres
+  adapter: postgresql
+  host: /var/run/postgresql
+  port: 5432
+  username: postgres
+  password:
+  encoding: unicode
+
+# Comment the the mysql line and uncomment the postgres line
+# if you want to use postgres
+common: &common
+  # Choose one of the following
+  # <<: *mysql
+  <<: *postgres
+
+  # Should match environment.sidekiq.concurrency
+  #pool: 25
+  
+##################################################
+#### CONFIGURE ABOVE #############################
+##################################################
+
+# Normally you don't need to touch anything here
+
+postgres_travis: &postgres_travis
+  adapter: postgresql
+  username: postgres
+combined: &combined
+  <<: *common
+development:
+  <<: *combined
+  database: diaspora_development
+production:
+  <<: *combined
+  database: diaspora_production
+test:
+  <<: *combined
+  database: "diaspora_test"
+integration1:
+  <<: *combined
+  database: diaspora_integration1
+integration2:
+  <<: *combined
+  database: diaspora_integration2
diff --git a/debian/install b/debian/install
index cac1628..1f1a617 100644
--- a/debian/install
+++ b/debian/install
@@ -23,3 +23,4 @@ spec usr/share/diaspora
 vendor usr/share/diaspora
 debian/adduser.sh usr/lib/diaspora/scripts
 debian/grantpriv.sh usr/lib/diaspora/scripts
+debian/database.yml usr/share/diaspora/config

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git