Permalink
Browse files

do not use a root password for local dev

  • Loading branch information...
cantino committed Mar 18, 2013
1 parent defe0a6 commit 95994eb1b46c612afc5b1d6e1399da21d23bac1f
Showing with 2 additions and 3 deletions.
  1. +0 −1 .travis.yml
  2. +2 −2 config/database.yml
View
@@ -2,7 +2,6 @@ language: ruby
bundler_args: --without development production
rvm:
- 1.9.3
- - jruby-19mode # JRuby in 1.9 mode
before_script:
- mysql -e 'create database huginn_test;'
script: "bundle exec rake"
View
@@ -2,7 +2,7 @@ development:
adapter: mysql2
database: huginn_development
username: root
- password: password
+ password:
socket: <%= ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
encoding: utf8
reconnect: true
@@ -15,7 +15,7 @@ test:
adapter: mysql2
database: huginn_test
username: root
- password: password
+ password:
socket: <%= ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
encoding: utf8
reconnect: true

0 comments on commit 95994eb

Please sign in to comment.