From 820a713f5299daf2d36c400ba5230511dec4d61d Mon Sep 17 00:00:00 2001
From: JD <j.davis2344@student.leedsbeckett.ac.uk>
Date: Mon, 17 Apr 2023 03:57:29 +0100
Subject: [PATCH 1/2] Apache base fix

---
 .../apache/secgen_metadata.xml                     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml b/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml
index d0cfddd2a..c345140d8 100644
--- a/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml
+++ b/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <service xmlns="http://www.github/cliffe/SecGen/service"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.github/cliffe/SecGen/service">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.github/cliffe/SecGen/service">
   <name>Apache HTTP Server - Stretch/Kali Compatible</name>
   <author>Z. Cliffe Schreuders</author>
   <author>Connor Wilson</author>
@@ -13,13 +13,15 @@
   <type>httpd</type>
   <platform>linux</platform>
 
-  <!--optional details-->
+  <!--optional
+  details-->
   <reference>https://httpd.apache.org/</reference>
   <reference>https://forge.puppet.com/puppetlabs/apache</reference>
   <software_name>apache</software_name>
   <software_license>Apache v2</software_license>
 
-  <!--Cannot co-exist with other apache installations-->
+  <!--Cannot
+  co-exist with other apache installations-->
   <conflict>
     <software_name>apache</software_name>
   </conflict>
@@ -27,9 +29,9 @@
     <name>.*Wheezy.*</name>
   </conflict>
   <conflict>
-    <name>.*Kali.*</name>
+    <name>bases/.*kali.*</name>
   </conflict>
   <requires>
     <type>update</type>
   </requires>
-</service>
+</service>
\ No newline at end of file

From c9fc88af32c4b5b7f54e8587057f3cc5a5e1411f Mon Sep 17 00:00:00 2001
From: JD <j.davis2344@student.leedsbeckett.ac.uk>
Date: Tue, 18 Apr 2023 01:34:29 +0100
Subject: [PATCH 2/2] update to modulepath

---
 .../http/apache_stretch_compatible/apache/secgen_metadata.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml b/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml
index c345140d8..81e4bcd2d 100644
--- a/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml
+++ b/modules/services/unix/http/apache_stretch_compatible/apache/secgen_metadata.xml
@@ -29,7 +29,7 @@
     <name>.*Wheezy.*</name>
   </conflict>
   <conflict>
-    <name>bases/.*kali.*</name>
+    <module_path>bases/.*kali.*</module_path>
   </conflict>
   <requires>
     <type>update</type>