diff --git a/lib/railsmachine/recipes.rb b/lib/railsmachine/recipes.rb index 9299102..b91cd2b 100644 --- a/lib/railsmachine/recipes.rb +++ b/lib/railsmachine/recipes.rb @@ -42,6 +42,9 @@ set :apache_ssl_ip, nil set :apache_ssl_forward_all, false + # mysql defaults + set :mysql_admin, nil + set :repository do scm = fetch(:scm) repos_base = "#{user}@#{domain}#{deploy_to}" diff --git a/lib/railsmachine/recipes/db/mysql.rb b/lib/railsmachine/recipes/db/mysql.rb index c343c89..3764742 100644 --- a/lib/railsmachine/recipes/db/mysql.rb +++ b/lib/railsmachine/recipes/db/mysql.rb @@ -24,8 +24,6 @@ def handle_mysql_password(user, channel, stream, data) Capistrano::Configuration.instance(:must_exist).load do - set :mysql_admin, nil - namespace :db do desc "Execute MySQL statements using --execute option. Set the 'sql' variable."