Skip to content

Commit

Permalink
Move deflate Module to apache_modules attribute
Browse files Browse the repository at this point in the history
mod_deflate is forced upon the system for anything but debian, without
the chance of disabling it or changing the configuration.

Moving it to the Attributes achieves the same, but allows it to be
disabled.
  • Loading branch information
CBeerta committed Jan 12, 2016
1 parent 138fbae commit 571eb6b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,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

Expand Down
3 changes: 0 additions & 3 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 571eb6b

Please sign in to comment.