From 58c89d74102cce1dd63d3e01b4564cf024028ac4 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 10 Apr 2012 18:27:28 -0500 Subject: [PATCH] fixing stuff --- chef-repo/cookbooks/mysql/recipes/client55.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/chef-repo/cookbooks/mysql/recipes/client55.rb b/chef-repo/cookbooks/mysql/recipes/client55.rb index e813645..af22a74 100644 --- a/chef-repo/cookbooks/mysql/recipes/client55.rb +++ b/chef-repo/cookbooks/mysql/recipes/client55.rb @@ -18,7 +18,7 @@ remote_file "/tmp/#{rpm_file}" do source "http://www.mysql.com/get/Downloads/MySQL-5.5/#{rpm_file}/from/http://mysql.llarian.net/" #Don't Download if its already installed - not_if "rpm -qa | egrep -qi 'MySQL-server-5.5'" + not_if "rpm -qa | egrep -qi 'MySQL-client-5.5'" notifies :install, "rpm_package[#{rpm_file}]", :immediately #If we already downloaded it, don't download it again. Unlikely to be useful in the real world, but a time saver during dev/testing action :create_if_missing @@ -53,18 +53,4 @@ end -#Enable and Start MySQL -service "mysql" do - supports :status => true, :restart => true, :reload => true - action [ :enable, :start ] -end -#Set Password -execute "assign-root-password" do - command "#{node['mysql']['mysqladmin_bin']} -u root password \"#{node['mysql']['server_root_password']}\"" - action :run -end -execute "assign-root-password" do - command "#{node['mysql']['mysqladmin_bin']} -u root -h localhost password \"#{node['mysql']['server_root_password']}\"" - action :run -end