Merge pull request #44 from Rud5G/39-update-dependencies

Fix database issue
Rud5G · Feb 26, 2015 · 394bbc1 · 394bbc1
2 parents 5cd488f + 1c4eeef
commit 394bbc1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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.2'
+version          '0.6.3'
 
 depends 'baseserver', '~> 0.7.10'
 

diff --git a/recipes/database.rb b/recipes/database.rb
@@ -17,6 +17,18 @@
 # 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]
@@ -33,7 +45,6 @@
 
       case databasedata['type']
         when 'mysql'
-          include_recipe 'mysql::server'
           include_recipe 'database::mysql'
           database_connection.merge!({ :username => 'root', :password => node['mysql']['server_root_password'] })