From 53670f35ff7fed4b73307ddaae05f0f323e7ae4c Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 24 Jan 2012 14:52:37 -0500
Subject: [PATCH] fix mysql deploy, does a local vagrant config really need a
 crazy mysql password

---
 Vagrantfile                       | 2 +-
 cookbooks/mysql/recipes/server.rb | 6 +++---
 cookbooks/wordpress/metadata.rb   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 911f307..ca05124 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -33,7 +33,7 @@ Vagrant::Config.run do |config|
   # to this Vagrantfile), and adding some recipes and/or roles.
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"
-    # chef.add_recipe "vim"
+    chef.add_recipe "vim"
     # chef.add_recipe "zsh"
     # chef.add_recipe "zlib"
     # chef.add_recipe "git"
diff --git a/cookbooks/mysql/recipes/server.rb b/cookbooks/mysql/recipes/server.rb
index f061c8c..07eb2b5 100644
--- a/cookbooks/mysql/recipes/server.rb
+++ b/cookbooks/mysql/recipes/server.rb
@@ -22,9 +22,9 @@
 include_recipe "mysql::client"
 
 # generate all passwords
-node.set_unless['mysql']['server_debian_password'] = secure_password
-node.set_unless['mysql']['server_root_password']   = secure_password
-node.set_unless['mysql']['server_repl_password']   = secure_password
+node.set_unless['mysql']['server_debian_password'] = 'password'
+node.set_unless['mysql']['server_root_password']   = 'password'
+node.set_unless['mysql']['server_repl_password']   = 'password'
 
 if platform?(%w{debian ubuntu})
 
diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb
index b6ba38d..8c0f2ee 100644
--- a/cookbooks/wordpress/metadata.rb
+++ b/cookbooks/wordpress/metadata.rb
@@ -21,7 +21,7 @@ end
 attribute "wordpress/version",
   :display_name => "Wordpress download version",
   :description => "Version of Wordpress to download from the Wordpress site.",
-  :default => "3.0.4"
+  :default => "latest"
   
 attribute "wordpress/checksum",
   :display_name => "Wordpress tarball checksum",