Merge pull request #268 from JD2344/apache-service

Apache base fix

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>
+    <module_path>bases/.*kali.*</module_path>
   </conflict>
   <requires>
     <type>update</type>
   </requires>
-</service>
+</service>