openstack
/
cookbook-openstack-dashboard
Code Issues Proposed changes

Headers module missing from enabled list 

Our openstack-dashboard sites config is using the Headers directive
to prevent html caching by default for security.  Need to make sure
this module is always enabled under apache.

Change-Id: I6f204f194a80b58e608a0a04afc19442d0444598
Related-Bug: #1446701
This commit is contained in:
Mark Vanderwiel 2015-06-30 10:05:48 -05:00
parent 0fbe6fe7af
commit 8e7ac18b06
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
recipes/apache2-server.rb
View File

@ -53,6 +53,7 @@ node.set['apache']['listen_addresses'] = listen_addresses.uniq
node.set['apache']['listen_ports'] = listen_ports.uniq
include_recipe 'apache2'
include_recipe 'apache2::mod_headers'
include_recipe 'apache2::mod_wsgi'
include_recipe 'apache2::mod_rewrite'
include_recipe 'apache2::mod_ssl' if node['openstack']['dashboard']['use_ssl']

11
spec/apache2-server_spec.rb
View File

@ -60,10 +60,13 @@ describe 'openstack-dashboard::apache2-server' do
end
it 'includes apache packages' do
expect(chef_run).to include_recipe('apache2')
expect(chef_run).to include_recipe('apache2::mod_wsgi')
expect(chef_run).to include_recipe('apache2::mod_rewrite')
expect(chef_run).to include_recipe('apache2::mod_ssl')
%w(apache2
apache2::mod_headers
apache2::mod_wsgi
apache2::mod_rewrite
apache2::mod_ssl).each do |recipe|
expect(chef_run).to include_recipe(recipe)
end
end
it 'does not include the apache mod_ssl package when ssl disabled' do