From f7c7ea33b6371d08b7866e8bcb203f43c145e6b8 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sat, 30 Apr 2011 00:56:35 +0200 Subject: [PATCH] improved database.yml.example --- config/database.yml.example | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/config/database.yml.example b/config/database.yml.example index b9b36387f..3ac184348 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -1,21 +1,22 @@ -test: +common: &common adapter: mysql2 - database: diaspora_test - username: root - password: password + host: "localhost" + port: 3306 +# socket: /tmp/mysql.sock + username: "root" + password: "password" charset: utf8 collation: utf8_bin + + development: - adapter: mysql2 + <<: *common database: diaspora_development - username: root - password: password - charset: utf8 - collation: utf8_bin + production: - adapter: mysql2 + <<: *common database: diaspora_production - username: root - password: password - charset: utf8 - collation: utf8_bin + +test: + <<: *common + database: "diaspora_test"