Merge pull request #456 from puppetlabs/remove_webapps_files

(MODULES-9520) Allow removal of webapps

Author: pmcmaw

manifests/install.pp

@@ -48,6 +48,8 @@
   $manage_user                    = undef,
   $manage_group                   = undef,
   $manage_home                    = undef,
+  Optional[Array[String]] $remove_default_webapps     = undef,
+
 
   # package options
   $package_ensure                 = undef,
@@ -91,4 +93,20 @@
       package_options => $package_options,
     }
   }
+
+  if $remove_default_webapps {
+    $remove_default_webapps.each |$folder| {
+      file{"remove ${folder}" :
+        ensure  => absent,
+        path    => "${catalina_home}/webapps/${folder}",
+        recurse => true,
+        purge   => true,
+        force   => true,
+        require => $install_from_source ? {
+          true    => Resource['tomcat::install::source', $name],
+          default => Resource['tomcat::install::package', $package_name]
+        }
+      }
+    }
+  }
 }

spec/acceptance/acceptance_1_readme_spec.rb

@@ -41,7 +41,7 @@
       class { 'java': }
 
       tomcat::install { '/opt/tomcat9':
-        source_url => '#{TOMCAT9_RECENT_SOURCE}'
+        source_url => '#{TOMCAT9_RECENT_SOURCE}',
       }
       tomcat::instance { 'tomcat9-first':
         catalina_home => '/opt/tomcat9',
@@ -103,4 +103,29 @@ class { 'java': }
       end
     end
   end
+
+  describe 'remove webapps built-in files' do
+    after :each do
+      run_shell('pkill -f tomcat', expect_failures: true)
+      run_shell('rm -rf /opt/tomcat*', expect_failures: true)
+      run_shell('rm -rf /opt/apache-tomcat*', expect_failures: true)
+    end
+    { '7' => TOMCAT7_RECENT_SOURCE, '8' => TOMCAT8_RECENT_SOURCE, '9' => TOMCAT9_RECENT_SOURCE }.each do |key, value|
+      context "when tomcat #{key} is installed remove_default_webapps => ['docs', 'examples']" do
+        install_tomcat = <<-MANIFEST
+        tomcat::install { '/opt/tomcat#{key}':
+          source_url => '#{value}',
+          remove_default_webapps => ['docs', 'examples'],
+        }
+        MANIFEST
+        it 'webapps should not contain the removed folder' do
+          apply_manifest(install_tomcat, catch_failures: true)
+          run_shell("ls -l /opt/tomcat#{key}/webapps") do |r|
+            expect(r.stdout).not_to include('docs')
+            expect(r.stdout).not_to include('examples')
+          end
+        end
+      end
+    end
+  end
 end