From efad4bcda8aa1b237a99adfd587032413d0de39b Mon Sep 17 00:00:00 2001
From: Rudger Gravestein <rudgergravestein@gmail.com>
Date: Fri, 27 Feb 2015 17:05:59 +0100
Subject: [PATCH 1/2] Reset dependencies, reset database recipe.

---
 metadata.rb         | 14 +++++++++-----
 recipes/database.rb | 14 +-------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index 70b47e3..85885e6 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,18 +6,22 @@
 long_description 'Installs/Configures ZF2'
 version          '0.6.3'
 
+# 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
index 2471813..7bcb750 100644
--- 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
-

From 43fca62ae84ffd599cf1e1efe14b3011800ab1c2 Mon Sep 17 00:00:00 2001
From: Rudger Gravestein <rudgergravestein@gmail.com>
Date: Fri, 27 Feb 2015 17:06:58 +0100
Subject: [PATCH 2/2] Bump version 0.7.0

---
 metadata.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.rb b/metadata.rb
index 85885e6..037041d 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 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'