From 1a196499e314b727e09100ac7a461de6e9615439 Mon Sep 17 00:00:00 2001 From: Mason Richins Date: Wed, 10 May 2023 17:17:17 -0400 Subject: [PATCH] allow_restart behavior for httpd --- cookbooks/fb_apache/recipes/default.rb | 18 ------------------ .../fb_apache/templates/default/httpd.conf.erb | 3 --- 2 files changed, 21 deletions(-) delete mode 100644 cookbooks/fb_apache/templates/default/httpd.conf.erb diff --git a/cookbooks/fb_apache/recipes/default.rb b/cookbooks/fb_apache/recipes/default.rb index 6251a4a10..a9603aafe 100644 --- a/cookbooks/fb_apache/recipes/default.rb +++ b/cookbooks/fb_apache/recipes/default.rb @@ -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' diff --git a/cookbooks/fb_apache/templates/default/httpd.conf.erb b/cookbooks/fb_apache/templates/default/httpd.conf.erb deleted file mode 100644 index 415c3d24a..000000000 --- a/cookbooks/fb_apache/templates/default/httpd.conf.erb +++ /dev/null @@ -1,3 +0,0 @@ -# This file is controlled by Chef, do not edit! - -<% FB::Apache.render_apache_conf(_buf, 0, node['fb_apache']['httpd_config']) %>