Permalink
Browse files

Update database.yml for Mysql connection in production

  • Loading branch information...
1 parent 32d8f19 commit ef22ece46eee6bf29f3104999dc9c0ca1b3f9a95 @marktabler committed Jun 10, 2013
Showing with 16 additions and 2 deletions.
  1. +2 −0 Gemfile
  2. +2 −0 Gemfile.lock
  3. +12 −2 config/database.yml
View
@@ -34,6 +34,8 @@ group :doc do
gem 'sdoc', require: false
end
+gem 'mysql2'
+
group :development, :test do
gem 'sqlite3'
end
View
@@ -54,6 +54,7 @@ GEM
mime-types (1.23)
minitest (4.7.4)
multi_json (1.7.6)
+ mysql2 (0.3.11)
pg (0.15.1)
polyglot (0.3.3)
rack (1.5.2)
@@ -116,6 +117,7 @@ DEPENDENCIES
coffee-rails (~> 4.0.0)
jbuilder (~> 1.0.1)
jquery-rails
+ mysql2
pg
rails (= 4.0.0.rc1)
sass-rails (~> 4.0.0.rc1)
View
@@ -6,16 +6,26 @@
development:
adapter: postgresql
encoding: unicode
- database: oberon_development
+ database: norrington_development
pool: 5
+production:
+ adapter: mysql2
+ encoding: utf8
+ reconnect: false
+ database: norrington_production
+ pool: 5
+ username: root
+ password:
+ socket: /tmp/mysql.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:
adapter: postgresql
encoding: unicode
- database: oberon_test
+ database: norrington_development
pool: 5
# production:

0 comments on commit ef22ece

Please sign in to comment.