Import mysql version 1.0.3

adamhjk · May 4, 2011 · e8e7d8f · e8e7d8f
1 parent 86a80f3
commit e8e7d8f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/cookbooks/mysql/attributes/server.rb b/cookbooks/mysql/attributes/server.rb
@@ -17,12 +17,6 @@
 # limitations under the License.
 #
 
-::Chef::Node.send(:include, Opscode::OpenSSL::Password)
-
-set_unless['mysql']['server_debian_password'] = secure_password
-set_unless['mysql']['server_root_password']   = secure_password
-set_unless['mysql']['server_repl_password']   = secure_password
-
 default['mysql']['bind_address']              = ipaddress
 default['mysql']['datadir']                   = "/var/lib/mysql"
 

diff --git a/cookbooks/mysql/metadata.json b/cookbooks/mysql/metadata.json
@@ -222,5 +222,5 @@
     "mysql::server": "Installs packages required for mysql servers w/o manual intervention",
     "mysql::server_ec2": "Performs EC2-specific mountpoint manipulation"
   },
-  "version": "1.0.2"
+  "version": "1.0.3"
 }
diff --git a/cookbooks/mysql/metadata.rb b/cookbooks/mysql/metadata.rb
@@ -3,7 +3,7 @@
 license           "Apache 2.0"
 description       "Installs and configures mysql for client or server"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "1.0.2"
+version           "1.0.3"
 recipe            "mysql", "Includes the client recipe to configure a client"
 recipe            "mysql::client", "Installs packages required for mysql clients using run_action magic"
 recipe            "mysql::server", "Installs packages required for mysql servers w/o manual intervention"

diff --git a/cookbooks/mysql/recipes/server.rb b/cookbooks/mysql/recipes/server.rb
@@ -17,8 +17,15 @@
 # limitations under the License.
 #
 
+::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
+
 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
+
 if platform?(%w{debian ubuntu})
 
   directory "/var/cache/local/preseeding" do