Merge pull request #401 from CBeerta/deflate-toggle

Remove forced deflate Module, add to default_modules instead
sous-chefs · Mar 26, 2016 · f797509 · f797509
2 parents 088655e + 571eb6b
commit f797509
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -346,7 +346,7 @@
   authz_host authz_user autoindex dir env mime negotiation setenvif
 )
 
-%w(log_config logio).each do |log_mod|
+%w(log_config logio deflate).each do |log_mod|
   default['apache']['default_modules'] << log_mod if %w(rhel fedora suse arch freebsd).include?(node['platform_family'])
 end
 

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -84,9 +84,6 @@
     command "/usr/local/bin/apache2_module_conf_generate.pl #{node['apache']['lib_dir']} #{node['apache']['dir']}/mods-available"
     action :nothing
   end
-
-  # enable mod_deflate for consistency across distributions
-  include_recipe 'apache2::mod_deflate'
 end
 
 if platform_family?('freebsd')