Merge pull request #46 from Rud5G/revert-to-stable-database-mysql-coo…

…kbook Revert to stable database mysql cookbook
Rud5G · Feb 27, 2015 · a69b55e · a69b55e
2 parents 394bbc1 43fca62
commit a69b55e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/metadata.rb b/metadata.rb
@@ -4,20 4,24 @@
 license 'Apache 2.0'
 description 'Installs/Configures ZF2'
 long_description 'Installs/Configures ZF2'
-version '0.6.3'
 version '0.7.0'
 
 # baseserver
 depends 'baseserver', '~> 0.7.10'
 
-depends 'php', '~> 1.5.0'
-depends 'database', '~> 4.0.2'
-depends 'mysql', '~> 6.0.13'
 # webserver
 depends 'apache2', '~> 3.0.1'
 depends 'php', '~> 1.5.0'
 
-depends 'nodejs'
 # database
 depends 'database', '~> 2.3.1'
 depends 'mysql', '~> 5.6.1'
 
 # frontend
 depends 'nodejs', '~> 2.2.0'
 
 # development
 depends 'samba', '~> 0.12.0'
 
 # additional for chef-solo
 depends 'chef-solo-search', '~> 0.5.1'
-
diff --git a/recipes/database.rb b/recipes/database.rb
@@ -17,18 17,6 @@
 # limitations under the License.
 #
 
-
-
-
-mysql_service 'default' do
- port '3306'
- version '5.5'
- initial_root_password node['mysql']['server_root_password']
- action [:create, :start]
-end
-
-
-
 begin
  data_bag('databases').each do |database|
  databasedata = data_bag_item('databases', database)[node.chef_environment]
@@ -45,6 33,7 @@
 
  case databasedata['type']
  when 'mysql'
  include_recipe 'mysql::server'
  include_recipe 'database::mysql'
  database_connection.merge!({ :username => 'root', :password => node['mysql']['server_root_password'] })
 
@@ -82,4 71,3 @@
 rescue Net::HTTPServerException => e
  Chef::Application.fatal!("could not load data bag; #{e}")
 end
-