Skip to content

Commit

Permalink
apache2 config files must not be owned by the apache user
Browse files Browse the repository at this point in the history
  • Loading branch information
llaurent authored and jtimberman committed Oct 28, 2011
1 parent 7e5f85f commit 07d7733
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions apache2/recipes/default.rb
Expand Up @@ -70,14 +70,14 @@
cookbook_file "/usr/local/bin/apache2_module_conf_generate.pl" do
source "apache2_module_conf_generate.pl"
mode 0755
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
end

%w{sites-available sites-enabled mods-available mods-enabled}.each do |dir|
directory "#{node[:apache][:dir]}/#{dir}" do
mode 0755
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
action :create
end
Expand All @@ -97,7 +97,7 @@
template "/usr/sbin/#{modscript}" do
source "#{modscript}.erb"
mode 0755
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
end
end
Expand All @@ -120,21 +120,21 @@
directory "#{node[:apache][:dir]}/ssl" do
action :create
mode 0755
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
end

directory "#{node[:apache][:dir]}/conf.d" do
action :create
mode 0755
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
end

directory node[:apache][:cache_dir] do
action :create
mode 0755
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
end

Expand All @@ -146,7 +146,7 @@
path "#{node[:apache][:dir]}/apache2.conf"
end
source "apache2.conf.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
mode 0644
notifies :restart, resources(:service => "apache2")
Expand All @@ -155,7 +155,7 @@
template "security" do
path "#{node[:apache][:dir]}/conf.d/security"
source "security.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
mode 0644
backup false
Expand All @@ -165,7 +165,7 @@
template "charset" do
path "#{node[:apache][:dir]}/conf.d/charset"
source "charset.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
mode 0644
backup false
Expand All @@ -174,7 +174,7 @@

template "#{node[:apache][:dir]}/ports.conf" do
source "ports.conf.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
variables :apache_listen_ports => node[:apache][:listen_ports].map{|p| p.to_i}.uniq
mode 0644
Expand All @@ -183,7 +183,7 @@

template "#{node[:apache][:dir]}/sites-available/default" do
source "default-site.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
mode 0644
notifies :restart, resources(:service => "apache2")
Expand Down
6 changes: 3 additions & 3 deletions apache2/recipes/mod_auth_openid.rb
Expand Up @@ -79,13 +79,13 @@
end

file "#{node[:apache][:cache_dir]}/mod_auth_openid.db" do
owner node[:apache][:user]
owner "root"
mode 0640
end

template "#{node[:apache][:dir]}/mods-available/authopenid.load" do
source "mods/authopenid.load.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:group]
mode 0644
end
Expand All @@ -96,7 +96,7 @@

template "/usr/local/bin/mod_auth_openid.rb" do
source "mod_auth_openid.rb.erb"
owner node[:apache][:user]
owner "root"
group node[:apache][:user]
mode 0750
end

0 comments on commit 07d7733

Please sign in to comment.