Merge pull request #64 from Rud5G/issue-62-mpm_event-reenabled-on-che…

…f-server Issue 62 mpm event reenabled on chef server
Rud5G · Apr 3, 2015 · df1797b · df1797b
2 parents 5d8c1f8 + 9d0d987
commit df1797b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 28 deletions.
diff --git a/attributes/apache2.rb b/attributes/apache2.rb
@@ -31,7 +31,9 @@
 # custom
 default['apache']['canonical_host'] = false
 
-
+# make sure for PHP we dont have the mpm_event mod
+# set override here and save to node in the apache2 recipe
+override['apache2']['mpm'] = 'prefork'
 
 #  default['apache']['listen_addresses']              #- Addresses that httpd should listen on. Default is any ("*").
 #  default['apache']['listen_ports']                  #- Ports that httpd should listen on. Default is port 80.

diff --git a/attributes/mysql.rb b/attributes/mysql.rb
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.7.3'
+version          '0.7.4'
 
 # baseserver
 depends 'baseserver', '~> 0.7.10'

diff --git a/recipes/apache2.rb b/recipes/apache2.rb
@@ -7,7 +7,15 @@
 # All rights reserved - Do Not Redistribute
 #
 
-include_recipe 'apache2'
+# make sure for PHP we dont have the mpm_event mod
+# save to node here and set override in the attributes/apache2
+node.set['apache2']['mpm'] = 'prefork'
+node.save unless Chef::Config[:solo]
+
+include_recipe 'apache2::default'
+
+# this should not be required anymore.
+# include_recipe 'apache2::mpm_prefork'
 
 
 begin

diff --git a/recipes/database.rb b/recipes/database.rb
@@ -20,6 +20,8 @@
 # need for secure_password
 ::Chef::Node.send(:include, Opscode::OpenSSL::Password)
 
+node.set_unless['mysql']['server_root_password'] = secure_password
+node.save unless Chef::Config[:solo]
 
 begin
   data_bag('databases').each do |database|