Merge "Disable apache's purge_configs option"

deployment/puppet/osnailyfacter/manifests/apache_mpm.pp

@@ -27,6 +27,13 @@ class osnailyfacter::apache_mpm {
     $mpm_module = 'worker'
   }
 
+  tidy { "remove-distro-mpm-modules":
+    path    => $::apache::params::mod_enable_dir,
+    recurse => true,
+    matches => [ '*mpm*' ],
+    rmdirs  => false,
+  }
+
   class { "::apache::mod::$mpm_module":
     startservers        => $startservers,
     maxclients          => $maxclients,

deployment/puppet/osnailyfacter/modular/apache/apache.pp

@@ -6,7 +6,7 @@ sysctl::value { 'net.ipv4.tcp_max_syn_backlog': value => '8192' }
 
 # Listen directives with host required for ip_based vhosts
 class { 'osnailyfacter::apache':
-  purge_configs => true,
+  purge_configs => false,
   listen_ports  => hiera_array('apache_ports', ['0.0.0.0:80']),
 }
 

tests/noop/spec/hosts/apache/apache_spec.rb

@@ -43,6 +43,11 @@ describe manifest do
         :mode   => '0755').with_content(/^sleep \d+/)
     end
 
+    it 'should not purge config files' do
+      should contain_class('apache').with(
+        'purge_configs' => 'false',
+      )
+    end
   end
   test_ubuntu_and_centos manifest
 end