Skip to content

Commit

Permalink
allow_restart behavior for httpd
Browse files Browse the repository at this point in the history
  • Loading branch information
mrichins committed May 10, 2023
1 parent b65fec9 commit 1a19649
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
18 changes: 0 additions & 18 deletions cookbooks/fb_apache/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,30 +147,12 @@
end
end

# By default the apache package installs some default config files which we're probably not interested in
if node['platform_family'] == 'rhel'
%w{autoindex ssl userdir welcome}.each do |file|
file "#{sitesdir}/#{file}.conf" do
not_if { node['fb_apache']['enable_default_site'] }
action :delete
end
end
end

# The package comes pre-installed with module configs, but we dropp off our own
# in fb_modules.conf. Also, we don't want non-Chef controlled module configs.
fb_apache_cleanup_modules 'doit' do
mod_dir moddir
end

template "#{httpdir}/conf/httpd.conf" do
owner 'root'
group 'root'
mode '0644'
notifies :verify, 'fb_apache_verify_configs[doit]', :before
notifies :reload, 'service[apache]'
end

template "#{moddir}/fb_modules.conf" do
not_if { node.centos6? }
owner 'root'
Expand Down
3 changes: 0 additions & 3 deletions cookbooks/fb_apache/templates/default/httpd.conf.erb

This file was deleted.

0 comments on commit 1a19649

Please sign in to comment.