Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make mysql_admin setting actually take when set by a user recipe.
Signed-off-by: pinguskahn <pinguskahn@gmail.com>
  • Loading branch information
seancribbs authored and pinguskahn committed Feb 5, 2009
1 parent f8b52f4 commit 0a8dfb0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 3 additions & 0 deletions lib/railsmachine/recipes.rb
Expand Up @@ -42,6 +42,9 @@
set :apache_ssl_ip, nil set :apache_ssl_ip, nil
set :apache_ssl_forward_all, false set :apache_ssl_forward_all, false


# mysql defaults
set :mysql_admin, nil

set :repository do set :repository do
scm = fetch(:scm) scm = fetch(:scm)
repos_base = "#{user}@#{domain}#{deploy_to}" repos_base = "#{user}@#{domain}#{deploy_to}"
Expand Down
2 changes: 0 additions & 2 deletions lib/railsmachine/recipes/db/mysql.rb
Expand Up @@ -24,8 +24,6 @@ def handle_mysql_password(user, channel, stream, data)


Capistrano::Configuration.instance(:must_exist).load do Capistrano::Configuration.instance(:must_exist).load do


set :mysql_admin, nil

namespace :db do namespace :db do


desc "Execute MySQL statements using --execute option. Set the 'sql' variable." desc "Execute MySQL statements using --execute option. Set the 'sql' variable."
Expand Down

0 comments on commit 0a8dfb0

Please sign in to comment.