From 66f45e27e898e4f497f4c250ab1985043e9a6666 Mon Sep 17 00:00:00 2001
From: JPL <julien.lefebvre@tomatopolis.com>
Date: Fri, 5 Dec 2014 02:40:22 -0500
Subject: [PATCH]  database and diaspora config

---
 config/database.yml.example | 54 -------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 config/database.yml.example

diff --git a/config/database.yml.example b/config/database.yml.example
deleted file mode 100644
index 880879afd14..00000000000
--- a/config/database.yml.example
+++ /dev/null
@@ -1,54 +0,0 @@
-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: localhost
-  port: 5432
-  username: zetzagmltcotbm
-  password: ixRkkAOuYUYO4Lt0JqFCah5ahB
-  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