From 950d0d4237ae3c7b1aee70644e5cc682dfd18f2e Mon Sep 17 00:00:00 2001
From: ts <thomashaw@localhost.localdomain>
Date: Wed, 26 Sep 2018 09:52:49 +0100
Subject: [PATCH] Temp fix: updated tomcat httpd to servlet to avoid conflicts.

---
 modules/services/unix/http/tomcat/secgen_metadata.xml | 2 +-
 modules/utilities/unix/hackerbot/secgen_metadata.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/unix/http/tomcat/secgen_metadata.xml b/modules/services/unix/http/tomcat/secgen_metadata.xml
index 3a92b4b44..d8c218fc3 100644
--- a/modules/services/unix/http/tomcat/secgen_metadata.xml
+++ b/modules/services/unix/http/tomcat/secgen_metadata.xml
@@ -9,7 +9,7 @@
   <module_license>Apache v2</module_license>
   <description>Puppetlabs Apache Tomcat module</description>
 
-  <type>httpd</type>
+  <type>servlet</type>
   <type>tomcat</type>
   <platform>linux</platform>
 
diff --git a/modules/utilities/unix/hackerbot/secgen_metadata.xml b/modules/utilities/unix/hackerbot/secgen_metadata.xml
index f9fd35788..eeca75d2a 100644
--- a/modules/utilities/unix/hackerbot/secgen_metadata.xml
+++ b/modules/utilities/unix/hackerbot/secgen_metadata.xml
@@ -36,6 +36,6 @@
     <type>update</type>
   </requires>
   <requires>
-    <module_path>.*/apache_kali.*</module_path>
+    <type>httpd</type>
   </requires>
 </utility>