#279 only add stubs if conf.d exists and don't delete it ourselves

sous-chefs · Apr 12, 2017 · 4e053c9 · 4e053c9
1 parent e286e02
commit 4e053c9
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 5 deletions.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -44,11 +44,6 @@
   end
 end
 
-directory "#{node['apache']['dir']}/conf.d" do
-  action :delete
-  recursive true
-end
-
 directory node['apache']['log_dir'] do
   mode '0755'
   recursive true

diff --git a/recipes/mod_apreq2.rb b/recipes/mod_apreq2.rb
@@ -44,6 +44,7 @@
 
 file "#{node['apache']['dir']}/conf.d/apreq.conf" do
   content '# conf is under mods-available/apreq.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end
 
 apache_module 'apreq'
diff --git a/recipes/mod_auth_cas.rb b/recipes/mod_auth_cas.rb
@@ -52,6 +52,7 @@
 
     file "#{node['apache']['dir']}/conf.d/auth_cas.conf" do
       content '# conf is under mods-available/auth_cas.conf - apache2 cookbook\n'
+      only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
     end
   end
 end

diff --git a/recipes/mod_fcgid.rb b/recipes/mod_fcgid.rb
@@ -26,6 +26,7 @@
 
   file "#{node['apache']['dir']}/conf.d/fcgid.conf" do
     content '# conf is under mods-available/fcgid.conf - apache2 cookbook\n'
+    only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
   end
 
   # CentOS 7 (and recent Fedoras) have Apache 2.4, where FCGI socket path

diff --git a/recipes/mod_perl.rb b/recipes/mod_perl.rb
@@ -53,6 +53,7 @@
 
 file "#{node['apache']['dir']}/conf.d/perl.conf" do
   content '# conf is under mods-available/perl.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end
 
 apache_module 'perl'
diff --git a/recipes/mod_php.rb b/recipes/mod_php.rb
@@ -85,6 +85,7 @@
 when 'rhel', 'fedora', 'suse', 'amazon'
   file "#{node['apache']['dir']}/conf.d/php.conf" do
     content '# conf is under mods-available/php.conf - apache2 cookbook\n'
+    only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
   end
 end
 

diff --git a/recipes/mod_python.rb b/recipes/mod_python.rb
@@ -38,6 +38,7 @@
 
 file "#{node['apache']['dir']}/conf.d/python.conf" do
   content '# conf is under mods-available/python.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end
 
 apache_module 'python'
diff --git a/recipes/mod_ssl.rb b/recipes/mod_ssl.rb
@@ -30,6 +30,7 @@
 
   file "#{node['apache']['dir']}/conf.d/ssl.conf" do
     content '# SSL Conf is under mods-available/ssl.conf - apache2 cookbook\n'
+    only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
   end
 end
 

diff --git a/recipes/mod_wsgi.rb b/recipes/mod_wsgi.rb
@@ -28,6 +28,7 @@
 
 file "#{node['apache']['dir']}/conf.d/wsgi.conf" do
   content '# conf is under mods-available/wsgi.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end
 
 apache_module 'wsgi'
diff --git a/recipes/mod_xsendfile.rb b/recipes/mod_xsendfile.rb
@@ -32,6 +32,7 @@
 
 file "#{node['apache']['dir']}/conf.d/xsendfile.conf" do
   content '# conf is under mods-available/xsendfile.conf - apache2 cookbook\n'
+  only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
 end
 
 apache_module 'xsendfile'
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ @@
         file "#{node['apache']['dir']}/conf.d/auth_cas.conf" do
           content '# conf is under mods-available/auth_cas.conf - apache2 cookbook\n'
+          only_if { ::Dir.exist?("#{node['apache']['dir']}/conf.d") }
         end
       end
     end
@@ Expand Down @@