Permalink
Browse files

fix bug caused by the removal of mysql_database LWRP from the mysql c…

…ookbook starting with version 1.2.0
  • Loading branch information...
1 parent 5215b82 commit 607e877e711422e82395dad928273b49b677e700 @mdxp mdxp committed Jun 23, 2012
Showing with 6 additions and 5 deletions.
  1. +4 −0 CHANGELOG.md
  2. +1 −1 metadata.rb
  3. +1 −4 recipes/default.rb
View
@@ -1,3 +1,7 @@
+## v1.1.0:
+
+* fix bug caused by the removal of `mysql_database` LWRP from the mysql cookbook starting with version 1.2.0
+
## v1.0.0:
* dropping support for drupal6.x; this requires drupal7 for the install to work
View
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs/Configures drupal"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.0.1"
+version "1.1.0"
recipe "drupal", "Installs and configures Drupal"
recipe "drupal::cron", "Sets up the default drupal cron"
recipe "drupal::drush", "Installs drush - a command line shell and scripting interface for Drupal"
View
@@ -44,10 +44,7 @@
execute "create #{node[:drupal][:db][:database]} database" do
command "/usr/bin/mysqladmin -u root -p#{node[:mysql][:server_root_password]} create #{node[:drupal][:db][:database]}"
- not_if do
- m = Mysql.new("localhost", "root", node[:mysql][:server_root_password])
- m.list_dbs.include?(node[:drupal][:db][:database])
- end
+ not_if "mysql -u root -p#{node[:mysql][:server_root_password]} --silent --skip-column-names --execute=\"show databases like '#{node[:drupal][:db][:database]}'\" | grep #{node[:drupal][:db][:database]}"
end
execute "download-and-install-drupal" do

0 comments on commit 607e877

Please sign in to comment.