diff --git a/lib/objects/local_hackerbot_config_generator.rb b/lib/objects/local_hackerbot_config_generator.rb index 62d170aaa..e93d9d46e 100644 --- a/lib/objects/local_hackerbot_config_generator.rb +++ b/lib/objects/local_hackerbot_config_generator.rb @@ -95,7 +95,7 @@ class HackerbotConfigGenerator < StringGenerator lab_sheet_markdown = generate_lab_sheet(xml_config) - redcarpet = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(prettify:true, hard_wrap: true, with_toc_data: true), footnotes: true, fenced_code_blocks: true, no_intra_emphasis: true, autolink: true, highlight: true, lax_spacing: true) + redcarpet = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(prettify:true, hard_wrap: true, with_toc_data: true), footnotes: true, fenced_code_blocks: true, no_intra_emphasis: true, autolink: true, highlight: true, lax_spacing: true, tables: true) self.html_rendered = redcarpet.render(lab_sheet_markdown).force_encoding('UTF-8') redcarpet_toc = Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC.new()) self.html_TOC_rendered = redcarpet_toc.render(lab_sheet_markdown).force_encoding('UTF-8') diff --git a/modules/generators/structured_content/hackerbot_config/backups/templates/lab.xml.erb b/modules/generators/structured_content/hackerbot_config/backups/templates/lab.xml.erb index e10650a0f..49d1dd458 100644 --- a/modules/generators/structured_content/hackerbot_config/backups/templates/lab.xml.erb +++ b/modules/generators/structured_content/hackerbot_config/backups/templates/lab.xml.erb @@ -203,7 +203,7 @@ Randomised instance generated by [SecGen](http://github.com/cliffe/SecGen) (<%= 00 - :( You backed up to the correct location, but it wasn't an incremental backup... You probably need to ssh in and delete that last backup and try again. + :( You backed up to the correct location, but it wasn't an differential backup... You probably need to ssh in and delete that last backup and try again. :( Something went wrong... diff --git a/modules/generators/structured_content/hackerbot_config/hacker_vs_hackerbot_1/templates/backups_rsync_steps_attacks.xml.erb b/modules/generators/structured_content/hackerbot_config/hacker_vs_hackerbot_1/templates/backups_rsync_steps_attacks.xml.erb index 71a65f555..f05ae45bf 100644 --- a/modules/generators/structured_content/hackerbot_config/hacker_vs_hackerbot_1/templates/backups_rsync_steps_attacks.xml.erb +++ b/modules/generators/structured_content/hackerbot_config/hacker_vs_hackerbot_1/templates/backups_rsync_steps_attacks.xml.erb @@ -64,7 +64,7 @@ 00 - :( You backed up to the correct location, but it wasn't an incremental backup... You probably need to ssh in and delete that last backup and try again. + :( You backed up to the correct location, but it wasn't an differential backup... You probably need to ssh in and delete that last backup and try again. :( Something went wrong... diff --git a/modules/generators/structured_content/hackerbot_config/ids/templates/snort.md.erb b/modules/generators/structured_content/hackerbot_config/ids/templates/snort.md.erb index f00365680..e7eb9e071 100644 --- a/modules/generators/structured_content/hackerbot_config/ids/templates/snort.md.erb +++ b/modules/generators/structured_content/hackerbot_config/ids/templates/snort.md.erb @@ -46,7 +46,7 @@ This should trigger an alert from Snort, which is stored in an alerts log file. ```bash sudo tail -f /var/log/snort/alert ``` ->The tail program will wait for new alerts to be written to the file, and will display them as they are logged. +>The tail program will wait for new alerts to be written to the file, and will display them as they are logged. (Ctrl-C to exit) ==Do an nmap port scan of the web_server== VM (from the desktop VM): diff --git a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/intro.md.erb b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/intro.md.erb index 9ed62de1b..ffc66c8d4 100644 --- a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/intro.md.erb +++ b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/intro.md.erb @@ -7,7 +7,7 @@ - hackerbot_server (leave it running, you don't log into this) - ids_server (IP address: <%= $ids_server_ip %>) -- web_server (IP address: <%= $web_server_ip %>) +- web_server (IP address: <%= $web_server_ip %>, leave it running, you don't log into this) - desktop All of these VMs need to be running to complete the lab. @@ -34,6 +34,8 @@ Work through the below exercises, completing the Hackerbot challenges as noted. --- ## Getting Snort up and running +**On the ids_server VM:** + ==Change Snort's output== to something more readable: ```bash @@ -43,14 +45,29 @@ sudo vi /etc/snort/snort.conf > ":wq" to write changes and quit) -==Add the following line:== +==Add the following lines:== `output alert_fast` -==Change Snort's interface== to eth1 (or as you identified earlier), and set the local network to your IP address range (or "any"): +`include $RULE_PATH/my.rules` + +==Create a new rules file:== + +```bash +sudo touch /etc/snort/rules/my.rules +``` + +Let us edit the rules file without sudo: + +```bash +sudo chown <%= $main_user %> /etc/snort/rules/my.rules +``` + +==Change Snort's interface== to the interface with IP address <%= $ids_server_ip %> (likely eth1), and set the local network to your IP address range (or "any"): ```bash sudo vi /etc/snort/snort.debian.conf ``` +> If you are not sure which interface to use, list the interfaces with `ifconfig` or `ip a s` > Set the interface and HOME network range, and exit vi (Esc, ":wq"). ==Restart Snort:== @@ -63,9 +80,4 @@ sudo service snort start Snort should now be running, monitoring network traffic for activity. -It can be helpful to monitor network traffic while writing IDS rules. Start Wireshark: - -```bash -kdesudo wireshark & -``` -> For this exercise you can ignore the warnings about running Wireshark as root, or read online to learn to use setcap to grant Wireshark more specific privileges. +It can be helpful to monitor network traffic while writing IDS rules. You can start Wireshark with `kdesudo wireshark &` diff --git a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/lab.xml.erb b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/lab.xml.erb index e03e682c6..0e7741760 100644 --- a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/lab.xml.erb +++ b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/lab.xml.erb @@ -27,6 +27,7 @@ end $main_user = $first_account['username'].to_s + $main_user_pass = $first_account['password'].to_s $second_user = $second_account['username'].to_s $example_file = "/home/#{$second_user}/#{$files.sample}" $example_dir = "/home/#{$second_user}/personal_secrets/" @@ -114,14 +115,15 @@ Randomised instance generated by [SecGen](http://github.com/cliffe/SecGen) (<%= true + msfconsole -x "use exploit/unix/misc/distcc_exec; set RHOST <%= $web_server_ip %>; exploit" whoami > /dev/null; echo "<%= $flags.pop %>" > /dev/null; echo 'Find the flag! (in the network traffic)' - #6 Your webserver is about to be scanned/attacked. Use Tcpdump and/or Wireshark to view the behaviour of the attacker. There is a flag to be found over the wire. + Your webserver is about to be scanned/attacked. Use Tcpdump and/or Wireshark to view the behaviour of the attacker. There is a flag to be found over the wire. - 0 + Find the flag Hope you caught that. @@ -136,5 +138,150 @@ Randomised instance generated by [SecGen](http://github.com/cliffe/SecGen) (<%= <%= ERB.new(File.read self.templates_path + 'write_snort_rules.md.erb').result(self.get_binding) %> + +<% $rand_port = rand(65535) + $rand_alert1 = SecureRandom.hex(3) %> + sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_before; stat1=$?; nmap -sT -p <%= $rand_port - 1 %>-<%= $rand_port + 1 %> <%= $web_server_ip %> > /dev/null; stat2=$?; sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_after; stat3=$?; echo --$stat1$stat2$stat3; diff -n /tmp/snort_alert_before /tmp/snort_alert_after | tail -n 5 + false + + + Create a Snort rule that detects any TCP connection attempt to TCP port <%= $rand_port %> to <%= $web_server_ip %>. The alert must include the message "<%= $rand_alert1 %>". + + + ^--1 + :( Failed to scp to your system. + + + ^--01 + :( Failed to scan your system. + + + ^--[01][01]1 + :( Failed to scp to your system (the second time). + + + ^--00.*<%= $rand_alert1 %>.*<%= $rand_alert1 %> + :( Almost. The alert did fire, but it fired more than once! + + + <%= $rand_alert1 %> + :) Well done! <%= $flags.pop %>. + + + + :( Your rule didn't get triggered (or didn't include the right message). + + + + + +<% $rand_content1 = SecureRandom.hex(3) + $rand_alert2 = SecureRandom.hex(3) %> + sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_before; stat1=$?; (sleep 1; echo "USER <%= $rand_content1 %>"; sleep 2; killall -9 nc ) | nc <%= $web_server_ip %> 110 > /dev/null; (sleep 1; echo "user test"; echo "pass test"; echo "stat"; echo "quit"; sleep 2; killall -9 nc ) | nc <%= $web_server_ip %> 110 > /dev/null; stat2=$?; sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_after; stat3=$?; echo --$stat1$stat2$stat3; diff -n /tmp/snort_alert_before /tmp/snort_alert_after | tail -n 5 + false + + + Create a Snort rule that detects any packet with the contents "<%= $rand_content1 %>" to <%= $web_server_ip %>. The alert must include the message "<%= $rand_alert2 %>". + + + ^--1 + :( Failed to scp to your system. + + + ^--0.*<%= $rand_alert2 %>.*<%= $rand_alert2 %> + :( Almost, but your rule triggered too many times. Are you inspecting the content of the connection? + + + ^--0.*<%= $rand_alert2 %> + :) Well done! <%= $flags.pop %>. + + + + :( Your rule didn't get triggered (or didn't include the right message). + + + + +<%= ERB.new(File.read self.templates_path + 'random_service_ids_rule.xml.erb').result(self.get_binding) %> +<%= ERB.new(File.read self.templates_path + 'random_service_ids_rule.xml.erb').result(self.get_binding) %> +<%= ERB.new(File.read self.templates_path + 'random_service_ids_rule.xml.erb').result(self.get_binding) %> + + + +<% $rand_alert4 = SecureRandom.hex(3) + $flag1 = $flags.pop + $flag2 = $flags.pop + $flag3 = $flags.pop +%> + sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_before; stat1=$?; nmap -sT -p 110 <%= $web_server_ip %> > /dev/null; (sleep 1; echo "USER <%= $main_user %>"; echo "PASS <%= $main_user_pass %>"; echo "STAT"; echo "QUIT"; sleep 2; killall -9 nc ) | nc <%= $web_server_ip %> 110; (sleep 1; echo "user test"; echo "pass test"; echo "stat"; echo "quit"; sleep 2; killall -9 nc ) | nc <%= $web_server_ip %> 110; stat2=$?; sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_after; stat3=$?; echo --$stat1$stat2$stat3; diff -n /tmp/snort_alert_before /tmp/snort_alert_after | tail -n 5 + false + + + Create a Snort rule that detects any unencrypted POP3 email *user authentication attempt* (someone trying to log in), to a mail server on <%= $web_server_ip %>. The alert must include the message "<%= $rand_alert4 %>". Up to three flags will be awarded, based on the quality of the rule. + + + ^--1 + :( Failed to scp to your system. + + + ^--0.*<%= $rand_alert4 %>.*<%= $rand_alert4 %>.*<%= $rand_alert4 %> + :( Almost, but your rule triggered too many times. Are you inspecting the content of the connection? + + + ^--0.*<%= $rand_alert4 %>.*Classification.*User.*<%= $rand_alert4 %> + :-D Well done! ALL THREE FLAGS!: <%= $flag1 %>, <%= $flag2 %>, <%= $flag3 %>. + + + + ^--0.*<%= $rand_alert4 %>.*<%= $rand_alert4 %> + 8-) Well done! Two flags: <%= $flag1 %>, <%= $flag2 %>. Could be further improved with a classification. + + + + ^--0.*<%= $rand_alert4 %> + :) Well done! <%= $flag1 %>. The alert did get triggered, but it fired only under some conditions. Is your rule caps sensitive? More flags are to be had from a better rule ;-) + + + + :( Your rule didn't get triggered (or didn't include the right message). + + + + +<% $rand_alert5 = SecureRandom.hex(3) %> + sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_before; stat1=$?; curl <%= $web_server_ip %> >/dev/null; curl <%= $web_server_ip %>/contact.html >/dev/null; stat2=$?; sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_after; stat3=$?; echo --$stat1$stat2$stat3; diff -n /tmp/snort_alert_before /tmp/snort_alert_after | tail -n 5 + false + + + Create a Snort rule that detects access to http://<%= $web_server_ip %> but NOT http://<%= $web_server_ip %>/contact.html. The alert must include the message "<%= $rand_alert5 %>". + + + ^--1 + :( Failed to scp to your system. + + + ^--01 + :( Failed to test your system. + + + ^--[01][01]1 + :( Failed to scp to your system (the second time). + + + ^--00.*<%= $rand_alert5 %>.*<%= $rand_alert5 %> + :( Almost, but your rule triggered too many times. Are you inspecting the content of the connection? + + + + ^--00.*<%= $rand_alert5 %> + :) Well done! <%= $flags.pop %>. + + + + :( Your rule didn't get triggered (or didn't include the right message). + + diff --git a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/random_service_ids_rule.xml.erb b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/random_service_ids_rule.xml.erb new file mode 100644 index 000000000..75d590e25 --- /dev/null +++ b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/random_service_ids_rule.xml.erb @@ -0,0 +1,31 @@ + +<% $services = {'FTP'=>'20','Telnet'=>'23','SMTP'=>'25','HTTP'=>'80','POP3'=>'110','IMAP'=>'143','SNMP'=>'161','LDAP'=>'389','HTTPS'=>'443','LDAPS'=>'636'} + $rand_service1 = $services.keys.sample + $rand_alert3 = SecureRandom.hex(3) %> + sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_before; stat1=$?; nmap -sT -p 1000,<%= $services[$rand_service1] %> <%= $web_server_ip %> > /dev/null; stat2=$?; sshpass -p <%= $root_password %> scp -prv -oStrictHostKeyChecking=no root@<%= $ids_server_ip %>:/var/log/snort/alert /tmp/snort_alert_after; stat3=$?; echo --$stat1$stat2$stat3; diff -u /tmp/snort_alert_before /tmp/snort_alert_after | tail -n 5 + false + + + Create a Snort rule that detects any TCP connection attempt to <%= $rand_service1 %> (just the connection attempt, does not require content inspection) on <%= $web_server_ip %>. The alert must include the message "<%= $rand_alert3 %>". + + + ^--1 + :( Failed to scp to your system. + + + ^--01 + :( Failed to scan your system. + + + ^--[01][01]1 + :( Failed to scp to your system (the second time). + + + <%= $rand_alert3 %> + :) Well done! <%= $flags.pop %>. + + + + :( Your rule didn't get triggered (or didn't include the right message). + + diff --git a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/write_snort_rules.md.erb b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/write_snort_rules.md.erb index 6a130b8f1..50541c5ba 100644 --- a/modules/generators/structured_content/hackerbot_config/ids_rules/templates/write_snort_rules.md.erb +++ b/modules/generators/structured_content/hackerbot_config/ids_rules/templates/write_snort_rules.md.erb @@ -1,16 +1,91 @@ +## Networking concepts (potentially revision) +### The Internet protocol suite +Modern network traffic (such as the Internet) typically uses the Internet protocol suite set of communications protocols. + +The Internet protocol suite has four abstraction layers: + +> * "**The application layer** is the scope within which applications create user data and communicate this data to other applications on another or the same host. The applications, or processes, make use of the services provided by the underlying, lower layers, especially the Transport Layer which provides reliable or unreliable pipes to other processes. The communications partners are characterized by the application architecture, such as the client-server model and peer-to-peer networking. This is the layer in which all higher level protocols, such as SMTP, FTP, SSH, HTTP, operate. Processes are addressed via ports which essentially represent services. +> * **The transport layer** performs host-to-host communications on either the same or different hosts and on either the local network or remote networks separated by routers. It provides a channel for the communication needs of applications. UDP is the basic transport layer protocol, providing an unreliable datagram service. The Transmission Control Protocol provides flow-control, connection establishment, and reliable transmission of data. +> * **The internet layer** has the task of exchanging datagrams across network boundaries. It provides a uniform networking interface that hides the actual topology (layout) of the underlying network connections. It is therefore also referred to as the layer that establishes internetworking, indeed, it defines and establishes the Internet. This layer defines the addressing and routing structures used for the TCP/IP protocol suite. The primary protocol in this scope is the Internet Protocol, which defines IP addresses. Its function in routing is to transport datagrams to the next IP router that has the connectivity to a network closer to the final data destination. +> * **The link layer** defines the networking methods within the scope of the local network link on which hosts communicate without intervening routers. This layer includes the protocols used to describe the local network topology and the interfaces needed to effect transmission of Internet layer datagrams to next-neighbor hosts." +(https://en.wikipedia.org/wiki/Internet_protocol_suite#Abstraction_layers) + +### Common services and (application layer) protocols +In order to make sense of network traffic, it is important to be aware of common protocols and port numbers. + +| TCP/UDP | Port(s) | Service | +|---------|---------|---------| +| tcp | 20/21 | File Transfer Protocol (FTP) (RFC 959) | +| tcp | 22 | Secure Shell (SSH) (RFC 4250-4256) | +| tcp | 23 | Telnet (RFC 854) | +| tcp | 25 | Simple Mail Transfer Protocol (SMTP) (RFC 5321) | +| tcp/udp | 53 | Domain Name System (DNS) (RFC 1034-1035) | +| udp | 69 | Trivial File Transfer Protocol (TFTP) (RFC 1350) | +| tcp | 80 | Hypertext Transfer Protocol (HTTP) (RFC 2616) | +| tcp | 110 | Post Office Protocol (POP) version 3 (RFC 1939) | +| tcp/udp | 137/138/139 | NetBIOS (RFC 1001-1002) | +| tcp | 143 | Internet Message Access Protocol (IMAP) (RFC 3501) | +| tcp/udp | 161/162 | Simple Network Management Protocol (SNMP) (RFC 1901-1908, 3411-3418) | +| tcp/udp | 389 | Lightweight Directory Access Protocol (LDAP) (RFC 4510) | +| tcp | 443 | Hypertext Transfer Protocol over SSL/TLS (HTTPS) (RFC 2818) | +| tcp/udp | 636 | Lightweight Directory Access Protocol over TLS/SSL (LDAPS) (RFC 4513) | +| tcp | 989/990 | FTP over TLS/SSL (RFC 4217) | +| tcp | 6660-6669 | Internet Relay Chat (IRC) | + +Please ensure you understand what each of these ports are used for. If you are not aware of what these protocols are, do some online reading. +> This may be a useful resource: http://www.pearsonitcertification.com/articles/article.aspx?p=1868080 + +Keep in mind that in recent years more and more network based functionality is moving to be hosted via Web protocols (HTTP and HTTPS). + +### Using Wireshark + +Note that in Wireshark you can view individual packets, including IP and TCP headers. Wireshark also has support for viewing TCP streams, so that you can view the traffic at the application layer as it is sent between the two computers (such as, client and server). (Simply right-click on a TCP entry and select *Follow > TCP Stream*.) + +**On the ids_server VM:** + +==Start Wireshark:== + +```bash +kdesudo wireshark & +``` +> For this exercise you can ignore the warnings about running Wireshark as root, or read online to learn to use setcap to grant Wireshark more specific privileges. + +Start capturing, listening to the interface with IP address <%= $ids_server_ip %>. +> If you are not sure, list the interfaces with `ifconfig` or `ip a s` + +**On the desktop VM:** + +While Wireshark is listening, ==access a web page from Firefox, browse to [*http://<%= $web_server_ip %>*](http://<%= $web_server_ip %>)== (In a new tab.) + +**On the ids_server VM:** + +Note that Wireshark uses colouring to make it easier to view traffic at a glance. ==View the colouring rules== via *View > Coloring Rules*. + +In Wireshark ==use display filters== to narrow down the packets displayed. At the top of the Wireshark window, enter `tcp.port == 80`, and press Enter. + +Right click the Web traffic, and select *Follow TCP Stream*. + +> Note that the website request starts with the client sending "GET /"... + +Note that you can also view the unzipped version of the content in Wireshark. In the view below the list of packets, ==expand the "Line-based text data: text/html" heading== + +==LogBook Question: What is the difference between these views?== + +Also experiment with using Wireshark display filters of `http` and `irc`. + ## Writing your own Snort rules -Snort is predominantly designed as a signature-based IDS. Snort monitors the network for matches to rules that indicate activity that should trigger an alert. You have now seen Snort detect a few types of activity, and have added a rule to detect ICMP packets. Next you will apply more complicated rules, and create your own. +Snort is primarily designed as a signature-based IDS. Snort monitors the network for matches to rules that indicate activity that should trigger an alert. You have now seen Snort detect a few types of activity. Next you will apply more complicated rules, and create your own. -You may find external reference guides to writing Snort rules helpful. See the resources section below, and Google may come in handy. +You may find external reference guides to writing Snort rules helpful. See the resources section below, and Google may come in handy (from outside the VMs). In general, rules are defined on one line (although, they can break over lines by using `\`), and take the form of: -**header (body)** +**header** (**body**) -where header = "**action** (log,alert) **protocol** (ip,tcp,udp,icmp,any) **source_IP** **source_port** **direction** (->,<>) **destination_IP** **destination_port**" +where header = "**action** (such as *log* or *alert*) **protocol** (*ip*,*tcp*,*udp*,*icmp*,*any*) **source_IP** **source_port** **direction** (->,<>) **destination_IP** **destination_port**" -> for example: `alert tcp any any -> any any` to make an alert for all TCP traffic, or `alert tcp any any -> 192.168.0.1 23` to make an alert for connections to telnet on the given IP address +> for example: `alert tcp any any -> any any` to make an alert for *any* TCP traffic, or `alert tcp any any -> <%= $web_server_ip %> 80` to make an alert for connections to unencrypted Web on the web_server VM's IP address and body = "**option; option: "parameter"; ...**" @@ -34,96 +109,39 @@ To give a unique identifier and revision version number: So for example the body could be: -> `msg: "user login attempt"; content: "user"; classtype:attempted-user; sid:1000001; rev:1;` +> `msg: "Website access"; content: "GET"; sid:1000001; rev:1;` + +<% $random_string = SecureRandom.hex(3) %> And bringing all this together a Snort rule could read: +> `alert tcp any any -> <%= $web_server_ip %> 80 (msg: "Website access <%= $random_string %>"; content: "GET /"; sid:1000001; rev:1;)` -> `alert tcp any any -> 192.168.0.1 110 (msg: "Email login attempt"; content: "user"; classtype:attempted-user; sid:1000001; rev:1;)` - -This rule looks at packets destined for 192.168.0.1 on the pop3 Email port (110), and sends an alert if the content contains the "user" command (which is used to log on to check email). Note that this rule is imperfect as it is, since it is case sensitive. +**On the ids_server VM:** Add the rule, and reload Snort: ```bash -echo "alert tcp any any -> 192.168.0.1 110 (msg: "Email login attempt"; content: "user"; classtype:attempted-user; sid:1000001; rev:1;)" >> /etc/snort/rules/my.rules +echo 'alert tcp any any -> <%= $web_server_ip %> 80 (msg: "Website access <%= $random_string %>"; content: "GET /"; sid:1000001; rev:1;)' >> /etc/snort/rules/my.rules sudo service snort restart ``` -# TODO add instructions to test this email rule +==Test the new rule...== -There are many more options that can make rules more precise and efficient. For example, making them case insensitive, or starting to search content after an offset. Feel free to do some reading, to help you to create better IDS rules. +**On the desktop VM:** -==Figure out how the rule could be improved to be case insensitive.== +While Wireshark is listening, ==access a web page from Firefox == browse to ==[*http://<%= $web_server_ip %>*](http://<%= $web_server_ip %>)== (In a new tab.) -Lets create a basic rule that detects any traffic on port 80 (web). ==Load this rule into Snort:== +**On the ids_server VM:** +==View the Snort alert file, to confirm your new rule generated an alert== ```bash -echo "alert tcp any any -> any 80 (msg: "Web traffic detected - RANDOM"; sid:1000002; rev:1;)" >> /etc/snort/rules/my.rules - -sudo service snort restart +sudo tail /var/log/snort/alert ``` -Browse to a website, and confirm the rule worked to generate an alert containing the text 'RANDOM'. -> Hackerbot will require you to include specific messages in your rules. + +> The output should include the alert, with <%= $random_string %>. Note that Hackerbot will instruct you to include random strings such as this, in the alerts. +> In this case, the website may have resulted in a few HTTP connections, therefore triggering the rule a few times. ==LabBook Question: Browse the existing rules in `/etc/snort/rules` and describe how one of the existing rules works.== - -# TODO list common protocols and the ports they use - - -# HACKERBOT ATTACKS - -Add a rule to detect any attempt to connect to a Telnet server, the output message must include "- RANDOM". Connections to a Telnet server could be a security issue, since logging into a networked computer using Telnet is known to be insecure because traffic is not encrypted. Don't forget to reload Snort! - - - - - -Once you have saved your rule and reloaded Snort, test this rule by using Telnet. Rather than starting an actual Telnet server (unless you want to do so), you can simulate this by using Netcat to listen on the Telnet port, then connect with Telnet from the desktop VM. - -On a terminal on the Kali Linux VM: - -```bash -netcat -l -p 23 -``` - -Leaving that running, and on a terminal on the openSUSE VM: - - -```bash -telnet localhost -``` -Type "hello" - - - -##TODO -Create a rule that only triggers on loading the Webserver's homepage (http://<%= $web_server_ip %>). Don't forget to reload Snort. - ---- - -Create a rule that triggers on the - -##TODO -Create a Snort rule that detects visits to the Leeds Beckett website from the Kali VM, but does not get triggered by general web browsing. - -Hints: -> Look at some of the existing Snort rules for detecting Web sites, such as those in /etc/snort/rules/community-inappropriate.rules - -> In the IMS labs or when using oVirt, you are likely using the proxy to access the web, so you will need to approach your rules a little differently, you may find you need to change the port you are listening to. Look at the output of tcpdump -A when you access a web page, what does the traffic contain that may point to what is being accessed? Have a look through the output of tcpdump for the text "Host". - -As before, include your name in the alert message. - -##TODO - -Setup Snort as an intrusion *prevention* system (IPS): on the Kali VM so that it can actually deny traffic, and demonstrate with a rule. You may wish to extend the Leeds Beckett website rule, so that all attempts to access the website are denied by Snort. - - -# write a rule that detects -"Top secret" -Randomly specified content -Randomly generated content (requires network monitoring) -attacks -random port number (by service name?) - +Tip: **Don't forget to reload Snort each time you change your rules.** \ No newline at end of file diff --git a/modules/services/unix/email/popa3d/manifests/config.pp b/modules/services/unix/email/popa3d/manifests/config.pp new file mode 100644 index 000000000..a725f611f --- /dev/null +++ b/modules/services/unix/email/popa3d/manifests/config.pp @@ -0,0 +1,6 @@ +class popa3d::config{ + service { 'popa3d': + enable => true, + ensure => 'running', + } +} diff --git a/modules/services/unix/email/popa3d/manifests/install.pp b/modules/services/unix/email/popa3d/manifests/install.pp new file mode 100644 index 000000000..0d05311f4 --- /dev/null +++ b/modules/services/unix/email/popa3d/manifests/install.pp @@ -0,0 +1,5 @@ +class popa3d::install{ + package { ['popa3d']: + ensure => 'installed', + } +} diff --git a/modules/services/unix/email/popa3d/popa3d.pp b/modules/services/unix/email/popa3d/popa3d.pp new file mode 100644 index 000000000..f525c02ef --- /dev/null +++ b/modules/services/unix/email/popa3d/popa3d.pp @@ -0,0 +1,2 @@ +include popa3d::install +include popa3d::config \ No newline at end of file diff --git a/modules/services/unix/email/popa3d/secgen_metadata.xml b/modules/services/unix/email/popa3d/secgen_metadata.xml new file mode 100644 index 000000000..b1603b80c --- /dev/null +++ b/modules/services/unix/email/popa3d/secgen_metadata.xml @@ -0,0 +1,21 @@ + + + + POP3 Server popa3d + Z. Cliffe Schreuders + MIT + popa3d is a tiny POP3 daemon designed with security as the primary goal. Accepts logins from existing users on the system. + + + pop3 + linux + + + popa3d + + + update + + \ No newline at end of file diff --git a/modules/services/unix/http/apache/CHANGELOG.md b/modules/services/unix/http/apache_kali_compatible/apache/CHANGELOG.md similarity index 100% rename from modules/services/unix/http/apache/CHANGELOG.md rename to modules/services/unix/http/apache_kali_compatible/apache/CHANGELOG.md diff --git a/modules/services/unix/http/apache/CONTRIBUTING.md b/modules/services/unix/http/apache_kali_compatible/apache/CONTRIBUTING.md similarity index 100% rename from modules/services/unix/http/apache/CONTRIBUTING.md rename to modules/services/unix/http/apache_kali_compatible/apache/CONTRIBUTING.md diff --git a/modules/services/unix/http/apache/Gemfile b/modules/services/unix/http/apache_kali_compatible/apache/Gemfile similarity index 100% rename from modules/services/unix/http/apache/Gemfile rename to modules/services/unix/http/apache_kali_compatible/apache/Gemfile diff --git a/modules/services/unix/http/apache/LICENSE b/modules/services/unix/http/apache_kali_compatible/apache/LICENSE similarity index 100% rename from modules/services/unix/http/apache/LICENSE rename to modules/services/unix/http/apache_kali_compatible/apache/LICENSE diff --git a/modules/services/unix/http/apache/MAINTAINERS.md b/modules/services/unix/http/apache_kali_compatible/apache/MAINTAINERS.md similarity index 100% rename from modules/services/unix/http/apache/MAINTAINERS.md rename to modules/services/unix/http/apache_kali_compatible/apache/MAINTAINERS.md diff --git a/modules/services/unix/http/apache/NOTICE b/modules/services/unix/http/apache_kali_compatible/apache/NOTICE similarity index 100% rename from modules/services/unix/http/apache/NOTICE rename to modules/services/unix/http/apache_kali_compatible/apache/NOTICE diff --git a/modules/services/unix/http/apache/README.md b/modules/services/unix/http/apache_kali_compatible/apache/README.md similarity index 100% rename from modules/services/unix/http/apache/README.md rename to modules/services/unix/http/apache_kali_compatible/apache/README.md diff --git a/modules/services/unix/http/apache/Rakefile b/modules/services/unix/http/apache_kali_compatible/apache/Rakefile similarity index 100% rename from modules/services/unix/http/apache/Rakefile rename to modules/services/unix/http/apache_kali_compatible/apache/Rakefile diff --git a/modules/services/unix/http/apache/apache.pp b/modules/services/unix/http/apache_kali_compatible/apache/apache.pp similarity index 100% rename from modules/services/unix/http/apache/apache.pp rename to modules/services/unix/http/apache_kali_compatible/apache/apache.pp diff --git a/modules/services/unix/http/apache/checksums.json b/modules/services/unix/http/apache_kali_compatible/apache/checksums.json similarity index 100% rename from modules/services/unix/http/apache/checksums.json rename to modules/services/unix/http/apache_kali_compatible/apache/checksums.json diff --git a/modules/services/unix/http/apache/examples/apache.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/apache.pp similarity index 100% rename from modules/services/unix/http/apache/examples/apache.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/apache.pp diff --git a/modules/services/unix/http/apache/examples/dev.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/dev.pp similarity index 100% rename from modules/services/unix/http/apache/examples/dev.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/dev.pp diff --git a/modules/services/unix/http/apache/examples/init.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/init.pp similarity index 100% rename from modules/services/unix/http/apache/examples/init.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/init.pp diff --git a/modules/services/unix/http/apache/examples/mod_load_params.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/mod_load_params.pp similarity index 100% rename from modules/services/unix/http/apache/examples/mod_load_params.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/mod_load_params.pp diff --git a/modules/services/unix/http/apache/examples/mods.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/mods.pp similarity index 100% rename from modules/services/unix/http/apache/examples/mods.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/mods.pp diff --git a/modules/services/unix/http/apache/examples/mods_custom.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/mods_custom.pp similarity index 100% rename from modules/services/unix/http/apache/examples/mods_custom.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/mods_custom.pp diff --git a/modules/services/unix/http/apache/examples/php.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/php.pp similarity index 100% rename from modules/services/unix/http/apache/examples/php.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/php.pp diff --git a/modules/services/unix/http/apache/examples/vhost.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhost.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhost.pp diff --git a/modules/services/unix/http/apache/examples/vhost_directories.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_directories.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhost_directories.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_directories.pp diff --git a/modules/services/unix/http/apache/examples/vhost_filter.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_filter.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhost_filter.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_filter.pp diff --git a/modules/services/unix/http/apache/examples/vhost_ip_based.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ip_based.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhost_ip_based.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ip_based.pp diff --git a/modules/services/unix/http/apache/examples/vhost_proxypass.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_proxypass.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhost_proxypass.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_proxypass.pp diff --git a/modules/services/unix/http/apache/examples/vhost_ssl.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ssl.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhost_ssl.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhost_ssl.pp diff --git a/modules/services/unix/http/apache/examples/vhosts_without_listen.pp b/modules/services/unix/http/apache_kali_compatible/apache/examples/vhosts_without_listen.pp similarity index 100% rename from modules/services/unix/http/apache/examples/vhosts_without_listen.pp rename to modules/services/unix/http/apache_kali_compatible/apache/examples/vhosts_without_listen.pp diff --git a/modules/services/unix/http/apache/files/httpd b/modules/services/unix/http/apache_kali_compatible/apache/files/httpd similarity index 100% rename from modules/services/unix/http/apache/files/httpd rename to modules/services/unix/http/apache_kali_compatible/apache/files/httpd diff --git a/modules/services/unix/http/apache/lib/facter/apache_version.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/facter/apache_version.rb similarity index 100% rename from modules/services/unix/http/apache/lib/facter/apache_version.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/facter/apache_version.rb diff --git a/modules/services/unix/http/apache/lib/puppet/parser/functions/bool2httpd.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/parser/functions/bool2httpd.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb diff --git a/modules/services/unix/http/apache/lib/puppet/parser/functions/validate_apache_log_level.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/parser/functions/validate_apache_log_level.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb diff --git a/modules/services/unix/http/apache/lib/puppet/provider/a2mod.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/provider/a2mod.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod.rb diff --git a/modules/services/unix/http/apache/lib/puppet/provider/a2mod/a2mod.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/provider/a2mod/a2mod.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb diff --git a/modules/services/unix/http/apache/lib/puppet/provider/a2mod/gentoo.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/provider/a2mod/gentoo.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb diff --git a/modules/services/unix/http/apache/lib/puppet/provider/a2mod/modfix.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/modfix.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/provider/a2mod/modfix.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/modfix.rb diff --git a/modules/services/unix/http/apache/lib/puppet/provider/a2mod/redhat.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/redhat.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/provider/a2mod/redhat.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/provider/a2mod/redhat.rb diff --git a/modules/services/unix/http/apache/lib/puppet/type/a2mod.rb b/modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/type/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache/lib/puppet/type/a2mod.rb rename to modules/services/unix/http/apache_kali_compatible/apache/lib/puppet/type/a2mod.rb diff --git a/modules/services/unix/http/apache/locales/config.yaml b/modules/services/unix/http/apache_kali_compatible/apache/locales/config.yaml similarity index 100% rename from modules/services/unix/http/apache/locales/config.yaml rename to modules/services/unix/http/apache_kali_compatible/apache/locales/config.yaml diff --git a/modules/services/unix/http/apache/locales/puppetlabs-apache.pot b/modules/services/unix/http/apache_kali_compatible/apache/locales/puppetlabs-apache.pot similarity index 100% rename from modules/services/unix/http/apache/locales/puppetlabs-apache.pot rename to modules/services/unix/http/apache_kali_compatible/apache/locales/puppetlabs-apache.pot diff --git a/modules/services/unix/http/apache/manifests/balancer.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/balancer.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/balancer.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/balancer.pp diff --git a/modules/services/unix/http/apache/manifests/balancermember.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/balancermember.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/balancermember.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/balancermember.pp diff --git a/modules/services/unix/http/apache/manifests/confd/no_accf.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/confd/no_accf.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/confd/no_accf.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/confd/no_accf.pp diff --git a/modules/services/unix/http/apache/manifests/custom_config.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/custom_config.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/custom_config.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/custom_config.pp diff --git a/modules/services/unix/http/apache/manifests/default_confd_files.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/default_confd_files.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/default_confd_files.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/default_confd_files.pp diff --git a/modules/services/unix/http/apache/manifests/default_mods.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/default_mods.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods.pp diff --git a/modules/services/unix/http/apache/manifests/default_mods/load.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods/load.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/default_mods/load.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/default_mods/load.pp diff --git a/modules/services/unix/http/apache/manifests/dev.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/dev.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/dev.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/dev.pp diff --git a/modules/services/unix/http/apache/manifests/fastcgi/server.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/fastcgi/server.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/fastcgi/server.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/fastcgi/server.pp diff --git a/modules/services/unix/http/apache/manifests/init.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/init.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/init.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/init.pp diff --git a/modules/services/unix/http/apache/manifests/listen.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/listen.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/listen.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/listen.pp diff --git a/modules/services/unix/http/apache/manifests/mod.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod.pp diff --git a/modules/services/unix/http/apache/manifests/mod/actions.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/actions.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/actions.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/actions.pp diff --git a/modules/services/unix/http/apache/manifests/mod/alias.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/alias.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/alias.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/alias.pp diff --git a/modules/services/unix/http/apache/manifests/mod/auth_basic.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_basic.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/auth_basic.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_basic.pp diff --git a/modules/services/unix/http/apache/manifests/mod/auth_cas.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_cas.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/auth_cas.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_cas.pp diff --git a/modules/services/unix/http/apache/manifests/mod/auth_kerb.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_kerb.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/auth_kerb.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_kerb.pp diff --git a/modules/services/unix/http/apache/manifests/mod/auth_mellon.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_mellon.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/auth_mellon.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/auth_mellon.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authn_core.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_core.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authn_core.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_core.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authn_dbd.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_dbd.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authn_dbd.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_dbd.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authn_file.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_file.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authn_file.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authn_file.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authnz_ldap.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_ldap.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authnz_ldap.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_ldap.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authnz_pam.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_pam.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authnz_pam.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authnz_pam.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authz_default.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_default.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authz_default.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_default.pp diff --git a/modules/services/unix/http/apache/manifests/mod/authz_user.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_user.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/authz_user.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/authz_user.pp diff --git a/modules/services/unix/http/apache/manifests/mod/autoindex.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/autoindex.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/autoindex.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/autoindex.pp diff --git a/modules/services/unix/http/apache/manifests/mod/cache.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cache.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/cache.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cache.pp diff --git a/modules/services/unix/http/apache/manifests/mod/cgi.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgi.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/cgi.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgi.pp diff --git a/modules/services/unix/http/apache/manifests/mod/cgid.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgid.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/cgid.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cgid.pp diff --git a/modules/services/unix/http/apache/manifests/mod/cluster.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cluster.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/cluster.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/cluster.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dav.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dav.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dav_fs.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_fs.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dav_fs.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_fs.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dav_svn.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_svn.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dav_svn.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dav_svn.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dbd.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dbd.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dbd.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dbd.pp diff --git a/modules/services/unix/http/apache/manifests/mod/deflate.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/deflate.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/deflate.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/deflate.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dev.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dev.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dev.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dev.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dir.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dir.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dir.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dir.pp diff --git a/modules/services/unix/http/apache/manifests/mod/disk_cache.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/disk_cache.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/disk_cache.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/disk_cache.pp diff --git a/modules/services/unix/http/apache/manifests/mod/dumpio.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dumpio.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/dumpio.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/dumpio.pp diff --git a/modules/services/unix/http/apache/manifests/mod/env.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/env.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/env.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/env.pp diff --git a/modules/services/unix/http/apache/manifests/mod/event.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/event.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/event.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/event.pp diff --git a/modules/services/unix/http/apache/manifests/mod/expires.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/expires.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/expires.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/expires.pp diff --git a/modules/services/unix/http/apache/manifests/mod/ext_filter.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ext_filter.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/ext_filter.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ext_filter.pp diff --git a/modules/services/unix/http/apache/manifests/mod/fastcgi.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fastcgi.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/fastcgi.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fastcgi.pp diff --git a/modules/services/unix/http/apache/manifests/mod/fcgid.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fcgid.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/fcgid.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/fcgid.pp diff --git a/modules/services/unix/http/apache/manifests/mod/filter.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/filter.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/filter.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/filter.pp diff --git a/modules/services/unix/http/apache/manifests/mod/geoip.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/geoip.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/geoip.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/geoip.pp diff --git a/modules/services/unix/http/apache/manifests/mod/headers.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/headers.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/headers.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/headers.pp diff --git a/modules/services/unix/http/apache/manifests/mod/include.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/include.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/include.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/include.pp diff --git a/modules/services/unix/http/apache/manifests/mod/info.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/info.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/info.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/info.pp diff --git a/modules/services/unix/http/apache/manifests/mod/intercept_form_submit.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/intercept_form_submit.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/intercept_form_submit.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/intercept_form_submit.pp diff --git a/modules/services/unix/http/apache/manifests/mod/itk.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/itk.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/itk.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/itk.pp diff --git a/modules/services/unix/http/apache/manifests/mod/ldap.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ldap.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/ldap.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ldap.pp diff --git a/modules/services/unix/http/apache/manifests/mod/lookup_identity.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/lookup_identity.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/lookup_identity.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/lookup_identity.pp diff --git a/modules/services/unix/http/apache/manifests/mod/mime.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/mime.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime.pp diff --git a/modules/services/unix/http/apache/manifests/mod/mime_magic.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime_magic.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/mime_magic.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/mime_magic.pp diff --git a/modules/services/unix/http/apache/manifests/mod/negotiation.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/negotiation.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/negotiation.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/negotiation.pp diff --git a/modules/services/unix/http/apache/manifests/mod/nss.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/nss.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/nss.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/nss.pp diff --git a/modules/services/unix/http/apache/manifests/mod/pagespeed.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/pagespeed.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/pagespeed.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/pagespeed.pp diff --git a/modules/services/unix/http/apache/manifests/mod/passenger.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/passenger.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/passenger.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/passenger.pp diff --git a/modules/services/unix/http/apache/manifests/mod/perl.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/perl.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/perl.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/perl.pp diff --git a/modules/services/unix/http/apache/manifests/mod/peruser.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/peruser.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/peruser.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/peruser.pp diff --git a/modules/services/unix/http/apache/manifests/mod/php.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/php.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/php.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/php.pp diff --git a/modules/services/unix/http/apache/manifests/mod/prefork.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/prefork.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/prefork.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/prefork.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_ajp.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_ajp.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_ajp.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_ajp.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_balancer.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_balancer.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_balancer.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_balancer.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_connect.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_connect.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_connect.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_connect.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_fcgi.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_fcgi.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_fcgi.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_fcgi.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_html.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_html.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_html.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_html.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_http.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_http.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_http.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_http.pp diff --git a/modules/services/unix/http/apache/manifests/mod/proxy_wstunnel.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_wstunnel.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/proxy_wstunnel.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/proxy_wstunnel.pp diff --git a/modules/services/unix/http/apache/manifests/mod/python.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/python.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/python.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/python.pp diff --git a/modules/services/unix/http/apache/manifests/mod/remoteip.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/remoteip.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/remoteip.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/remoteip.pp diff --git a/modules/services/unix/http/apache/manifests/mod/reqtimeout.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/reqtimeout.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/reqtimeout.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/reqtimeout.pp diff --git a/modules/services/unix/http/apache/manifests/mod/rewrite.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rewrite.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/rewrite.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rewrite.pp diff --git a/modules/services/unix/http/apache/manifests/mod/rpaf.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rpaf.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/rpaf.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/rpaf.pp diff --git a/modules/services/unix/http/apache/manifests/mod/security.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/security.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/security.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/security.pp diff --git a/modules/services/unix/http/apache/manifests/mod/setenvif.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/setenvif.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/setenvif.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/setenvif.pp diff --git a/modules/services/unix/http/apache/manifests/mod/shib.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/shib.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/shib.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/shib.pp diff --git a/modules/services/unix/http/apache/manifests/mod/socache_shmcb.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/socache_shmcb.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/socache_shmcb.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/socache_shmcb.pp diff --git a/modules/services/unix/http/apache/manifests/mod/speling.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/speling.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/speling.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/speling.pp diff --git a/modules/services/unix/http/apache/manifests/mod/ssl.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ssl.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/ssl.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/ssl.pp diff --git a/modules/services/unix/http/apache/manifests/mod/status.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/status.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/status.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/status.pp diff --git a/modules/services/unix/http/apache/manifests/mod/suexec.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suexec.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/suexec.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suexec.pp diff --git a/modules/services/unix/http/apache/manifests/mod/suphp.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suphp.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/suphp.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/suphp.pp diff --git a/modules/services/unix/http/apache/manifests/mod/userdir.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/userdir.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/userdir.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/userdir.pp diff --git a/modules/services/unix/http/apache/manifests/mod/version.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/version.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/version.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/version.pp diff --git a/modules/services/unix/http/apache/manifests/mod/vhost_alias.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/vhost_alias.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/vhost_alias.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/vhost_alias.pp diff --git a/modules/services/unix/http/apache/manifests/mod/worker.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/worker.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/worker.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/worker.pp diff --git a/modules/services/unix/http/apache/manifests/mod/wsgi.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/wsgi.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/wsgi.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/wsgi.pp diff --git a/modules/services/unix/http/apache/manifests/mod/xsendfile.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/xsendfile.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mod/xsendfile.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mod/xsendfile.pp diff --git a/modules/services/unix/http/apache/manifests/mpm.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/mpm.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/mpm.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/mpm.pp diff --git a/modules/services/unix/http/apache/manifests/namevirtualhost.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/namevirtualhost.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/namevirtualhost.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/namevirtualhost.pp diff --git a/modules/services/unix/http/apache/manifests/package.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/package.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/package.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/package.pp diff --git a/modules/services/unix/http/apache/manifests/params.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/params.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/params.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/params.pp diff --git a/modules/services/unix/http/apache/manifests/peruser/multiplexer.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/multiplexer.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/peruser/multiplexer.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/multiplexer.pp diff --git a/modules/services/unix/http/apache/manifests/peruser/processor.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/processor.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/peruser/processor.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/peruser/processor.pp diff --git a/modules/services/unix/http/apache/manifests/php.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/php.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/php.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/php.pp diff --git a/modules/services/unix/http/apache/manifests/proxy.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/proxy.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/proxy.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/proxy.pp diff --git a/modules/services/unix/http/apache/manifests/python.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/python.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/python.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/python.pp diff --git a/modules/services/unix/http/apache/manifests/security/rule_link.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/security/rule_link.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/security/rule_link.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/security/rule_link.pp diff --git a/modules/services/unix/http/apache/manifests/service.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/service.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/service.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/service.pp diff --git a/modules/services/unix/http/apache/manifests/ssl.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/ssl.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/ssl.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/ssl.pp diff --git a/modules/services/unix/http/apache/manifests/version.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/version.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/version.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/version.pp diff --git a/modules/services/unix/http/apache/manifests/vhost.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/vhost.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost.pp diff --git a/modules/services/unix/http/apache/manifests/vhost/custom.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost/custom.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/vhost/custom.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/vhost/custom.pp diff --git a/modules/services/unix/http/apache/manifests/vhosts.pp b/modules/services/unix/http/apache_kali_compatible/apache/manifests/vhosts.pp similarity index 100% rename from modules/services/unix/http/apache/manifests/vhosts.pp rename to modules/services/unix/http/apache_kali_compatible/apache/manifests/vhosts.pp diff --git a/modules/services/unix/http/apache/metadata.json b/modules/services/unix/http/apache_kali_compatible/apache/metadata.json similarity index 100% rename from modules/services/unix/http/apache/metadata.json rename to modules/services/unix/http/apache_kali_compatible/apache/metadata.json diff --git a/modules/services/unix/http/apache/secgen_metadata.xml b/modules/services/unix/http/apache_kali_compatible/apache/secgen_metadata.xml similarity index 100% rename from modules/services/unix/http/apache/secgen_metadata.xml rename to modules/services/unix/http/apache_kali_compatible/apache/secgen_metadata.xml diff --git a/modules/services/unix/http/apache/spec/acceptance/apache_parameters_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_parameters_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/apache_parameters_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_parameters_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/apache_ssl_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_ssl_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/apache_ssl_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/apache_ssl_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/class_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/class_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/class_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/class_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/custom_config_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/custom_config_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/custom_config_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/custom_config_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/default_mods_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/default_mods_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/default_mods_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/default_mods_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/itk_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/itk_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/itk_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/itk_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_dav_svn_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_dav_svn_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_deflate_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_deflate_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_deflate_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_deflate_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_fcgid_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_fcgid_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_fcgid_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_fcgid_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_mime_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_mime_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_mime_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_mime_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_negotiation_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_negotiation_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_negotiation_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_negotiation_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_pagespeed_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_pagespeed_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_passenger_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_passenger_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_passenger_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_passenger_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_php_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_php_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_php_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_php_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_proxy_html_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_proxy_html_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_security_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_security_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_security_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_security_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/mod_suphp_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_suphp_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/mod_suphp_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/mod_suphp_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/centos-7-x64.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/centos-7-x64.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/debian-8-x64.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/debian-8-x64.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/default.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/default.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/default.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/default.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/docker/centos-7.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/docker/centos-7.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/docker/debian-8.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/docker/debian-8.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/nodesets/suse.yml b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/suse.yml similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/nodesets/suse.yml rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/nodesets/suse.yml diff --git a/modules/services/unix/http/apache/spec/acceptance/prefork_worker_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/prefork_worker_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/prefork_worker_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/prefork_worker_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/service_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/service_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/service_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/service_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/version.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/version.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/version.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/version.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/vhost_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhost_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/vhost_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhost_spec.rb diff --git a/modules/services/unix/http/apache/spec/acceptance/vhosts_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhosts_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/acceptance/vhosts_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/acceptance/vhosts_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/apache_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/apache_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/apache_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/apache_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/dev_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/dev_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/dev_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/dev_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/alias_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/alias_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/alias_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/alias_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/auth_cas_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_cas_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/auth_cas_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_cas_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/auth_kerb_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_kerb_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/auth_kerb_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_kerb_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/auth_mellon_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_mellon_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/auth_mellon_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/auth_mellon_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/authn_dbd_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authn_dbd_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/authn_dbd_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authn_dbd_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/authnz_ldap_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/authnz_ldap_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/authnz_pam_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_pam_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/authnz_pam_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/authnz_pam_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/cluster_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/cluster_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/cluster_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/cluster_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/dav_svn_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dav_svn_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/dav_svn_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dav_svn_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/deflate_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/deflate_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/deflate_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/deflate_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/dev_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dev_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/dev_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dev_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/dir_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dir_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/dir_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dir_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/disk_cache_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/disk_cache_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/disk_cache_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/disk_cache_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/dumpio_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dumpio_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/dumpio_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/dumpio_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/event_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/event_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/event_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/event_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/expires_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/expires_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/expires_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/expires_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/ext_filter_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ext_filter_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/ext_filter_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ext_filter_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/fastcgi_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fastcgi_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/fastcgi_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fastcgi_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/fcgid_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fcgid_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/fcgid_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/fcgid_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/info_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/info_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/info_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/info_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/intercept_form_submit_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/intercept_form_submit_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/intercept_form_submit_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/intercept_form_submit_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/itk_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/itk_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/itk_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/itk_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/ldap_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ldap_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/ldap_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ldap_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/lookup_identity.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/lookup_identity.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/lookup_identity.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/lookup_identity.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/mime_magic_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_magic_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/mime_magic_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_magic_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/mime_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/mime_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/mime_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/negotiation_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/negotiation_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/negotiation_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/negotiation_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/pagespeed_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/pagespeed_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/pagespeed_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/pagespeed_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/passenger_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/passenger_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/passenger_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/passenger_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/perl_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/perl_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/perl_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/perl_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/peruser_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/peruser_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/peruser_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/peruser_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/php_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/php_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/php_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/php_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/prefork_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/prefork_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/prefork_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/prefork_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/proxy_balancer_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/proxy_balancer_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/proxy_connect_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_connect_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/proxy_connect_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_connect_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/proxy_html_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_html_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/proxy_html_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_html_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/proxy_wstunnel.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_wstunnel.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/proxy_wstunnel.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/proxy_wstunnel.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/python_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/python_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/python_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/python_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/remoteip_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/remoteip_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/remoteip_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/remoteip_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/reqtimeout_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/reqtimeout_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/reqtimeout_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/reqtimeout_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/rpaf_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/rpaf_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/rpaf_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/rpaf_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/security_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/security_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/security_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/security_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/shib_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/shib_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/shib_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/shib_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/speling_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/speling_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/speling_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/speling_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/ssl_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ssl_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/ssl_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/ssl_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/status_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/status_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/status_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/status_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/suphp_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/suphp_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/suphp_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/suphp_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/userdir_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/userdir_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/userdir_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/userdir_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/worker_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/worker_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/worker_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/worker_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/mod/wsgi_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/wsgi_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/mod/wsgi_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/mod/wsgi_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/params_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/params_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/params_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/params_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/service_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/service_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/service_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/service_spec.rb diff --git a/modules/services/unix/http/apache/spec/classes/vhosts_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/classes/vhosts_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/classes/vhosts_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/classes/vhosts_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/balancer_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancer_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/balancer_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancer_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/balancermember_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancermember_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/balancermember_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/balancermember_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/custom_config_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/custom_config_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/custom_config_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/custom_config_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/fastcgi_server_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/fastcgi_server_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/fastcgi_server_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/fastcgi_server_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/mod_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/mod_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/mod_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/mod_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/modsec_link_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/modsec_link_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/modsec_link_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/modsec_link_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/vhost_custom_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_custom_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/vhost_custom_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_custom_spec.rb diff --git a/modules/services/unix/http/apache/spec/defines/vhost_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/defines/vhost_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/defines/vhost_spec.rb diff --git a/modules/services/unix/http/apache/spec/fixtures/files/negotiation.conf b/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/negotiation.conf similarity index 100% rename from modules/services/unix/http/apache/spec/fixtures/files/negotiation.conf rename to modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/negotiation.conf diff --git a/modules/services/unix/http/apache/spec/fixtures/files/spec b/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/spec similarity index 100% rename from modules/services/unix/http/apache/spec/fixtures/files/spec rename to modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/files/spec diff --git a/modules/services/unix/http/apache/spec/fixtures/site_apache/templates/fake.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/site_apache/templates/fake.conf.erb similarity index 100% rename from modules/services/unix/http/apache/spec/fixtures/site_apache/templates/fake.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/site_apache/templates/fake.conf.erb diff --git a/modules/services/unix/http/apache/spec/fixtures/templates/negotiation.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/templates/negotiation.conf.erb similarity index 100% rename from modules/services/unix/http/apache/spec/fixtures/templates/negotiation.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/fixtures/templates/negotiation.conf.erb diff --git a/modules/services/unix/http/apache/spec/spec_helper.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper.rb similarity index 100% rename from modules/services/unix/http/apache/spec/spec_helper.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper.rb diff --git a/modules/services/unix/http/apache/spec/spec_helper_acceptance.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_acceptance.rb similarity index 100% rename from modules/services/unix/http/apache/spec/spec_helper_acceptance.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_acceptance.rb diff --git a/modules/services/unix/http/apache/spec/spec_helper_local.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_local.rb similarity index 100% rename from modules/services/unix/http/apache/spec/spec_helper_local.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/spec_helper_local.rb diff --git a/modules/services/unix/http/apache/spec/unit/apache_version_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/apache_version_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/unit/apache_version_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/unit/apache_version_spec.rb diff --git a/modules/services/unix/http/apache/spec/unit/provider/a2mod/gentoo_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/unit/provider/a2mod/gentoo_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb diff --git a/modules/services/unix/http/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb similarity index 100% rename from modules/services/unix/http/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb diff --git a/modules/services/unix/http/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb similarity index 100% rename from modules/services/unix/http/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb rename to modules/services/unix/http/apache_kali_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb diff --git a/modules/services/unix/http/apache/templates/confd/no-accf.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/confd/no-accf.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/confd/no-accf.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/confd/no-accf.conf.erb diff --git a/modules/services/unix/http/apache/templates/fastcgi/server.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/fastcgi/server.erb similarity index 100% rename from modules/services/unix/http/apache/templates/fastcgi/server.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/fastcgi/server.erb diff --git a/modules/services/unix/http/apache/templates/httpd.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/httpd.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/httpd.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/httpd.conf.erb diff --git a/modules/services/unix/http/apache/templates/listen.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/listen.erb similarity index 100% rename from modules/services/unix/http/apache/templates/listen.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/listen.erb diff --git a/modules/services/unix/http/apache/templates/mod/alias.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/alias.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/alias.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/alias.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/auth_cas.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_cas.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/auth_cas.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_cas.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/auth_mellon.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_mellon.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/auth_mellon.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/auth_mellon.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/authn_dbd.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authn_dbd.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/authn_dbd.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authn_dbd.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/authnz_ldap.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authnz_ldap.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/authnz_ldap.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/authnz_ldap.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/autoindex.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/autoindex.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/autoindex.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/autoindex.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/cgid.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/cgid.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cgid.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/cluster.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cluster.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/cluster.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/cluster.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/dav_fs.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dav_fs.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/dav_fs.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dav_fs.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/deflate.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/deflate.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/deflate.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/deflate.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/dir.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dir.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/dir.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dir.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/disk_cache.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/disk_cache.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/disk_cache.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/disk_cache.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/dumpio.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dumpio.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/dumpio.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/dumpio.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/event.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/event.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/event.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/event.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/expires.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/expires.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/expires.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/expires.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/ext_filter.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ext_filter.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/ext_filter.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ext_filter.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/fastcgi.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fastcgi.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/fastcgi.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fastcgi.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/fcgid.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fcgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/fcgid.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/fcgid.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/geoip.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/geoip.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/geoip.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/geoip.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/info.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/info.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/info.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/info.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/itk.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/itk.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/itk.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/itk.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/ldap.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ldap.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/ldap.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ldap.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/load.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/load.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/load.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/load.erb diff --git a/modules/services/unix/http/apache/templates/mod/mime.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/mime.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/mime_magic.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime_magic.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/mime_magic.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mime_magic.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/mpm_event.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mpm_event.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/mpm_event.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/mpm_event.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/negotiation.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/negotiation.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/negotiation.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/negotiation.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/nss.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/nss.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/nss.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/nss.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/pagespeed.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/pagespeed.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/pagespeed.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/pagespeed.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/passenger.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/passenger.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/passenger.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/passenger.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/peruser.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/peruser.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/peruser.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/peruser.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/php.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/php.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/php.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/php.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/prefork.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/prefork.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/prefork.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/prefork.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/proxy.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/proxy.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/proxy_balancer.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_balancer.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/proxy_balancer.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_balancer.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/proxy_html.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_html.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/proxy_html.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/proxy_html.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/remoteip.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/remoteip.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/remoteip.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/remoteip.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/reqtimeout.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/reqtimeout.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/reqtimeout.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/reqtimeout.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/rpaf.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/rpaf.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/rpaf.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/rpaf.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/security.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/security.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/security_crs.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security_crs.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/security_crs.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/security_crs.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/setenvif.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/setenvif.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/setenvif.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/setenvif.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/ssl.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ssl.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/ssl.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/ssl.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/status.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/status.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/status.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/status.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/suphp.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/suphp.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/suphp.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/suphp.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/userdir.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/userdir.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/userdir.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/userdir.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/worker.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/worker.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/worker.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/worker.conf.erb diff --git a/modules/services/unix/http/apache/templates/mod/wsgi.conf.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/mod/wsgi.conf.erb similarity index 100% rename from modules/services/unix/http/apache/templates/mod/wsgi.conf.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/mod/wsgi.conf.erb diff --git a/modules/services/unix/http/apache/templates/namevirtualhost.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/namevirtualhost.erb similarity index 100% rename from modules/services/unix/http/apache/templates/namevirtualhost.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/namevirtualhost.erb diff --git a/modules/services/unix/http/apache/templates/ports_header.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/ports_header.erb similarity index 100% rename from modules/services/unix/http/apache/templates/ports_header.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/ports_header.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_access_log.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_access_log.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_access_log.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_access_log.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_action.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_action.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_action.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_action.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_additional_includes.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_additional_includes.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_additional_includes.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_additional_includes.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_aliases.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_aliases.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_aliases.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_aliases.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_allow_encoded_slashes.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_allow_encoded_slashes.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_allow_encoded_slashes.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_allow_encoded_slashes.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_auth_cas.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_cas.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_auth_cas.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_cas.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_auth_kerb.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_kerb.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_auth_kerb.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_auth_kerb.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_block.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_block.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_block.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_block.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_charsets.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_charsets.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_charsets.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_charsets.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_custom_fragment.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_custom_fragment.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_custom_fragment.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_custom_fragment.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_directories.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_directories.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_directories.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_directories.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_docroot.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_docroot.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_docroot.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_docroot.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_error_document.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_error_document.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_error_document.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_error_document.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_fallbackresource.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fallbackresource.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_fallbackresource.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fallbackresource.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_fastcgi.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fastcgi.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_fastcgi.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_fastcgi.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_file_footer.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_footer.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_file_footer.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_footer.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_file_header.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_header.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_file_header.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_file_header.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_filters.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_filters.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_filters.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_filters.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_header.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_header.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_header.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_header.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_http_protocol_options.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_http_protocol_options.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_http_protocol_options.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_http_protocol_options.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_itk.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_itk.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_itk.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_itk.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_jk_mounts.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_jk_mounts.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_jk_mounts.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_jk_mounts.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_keepalive_options.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_keepalive_options.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_keepalive_options.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_keepalive_options.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_logging.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_logging.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_logging.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_logging.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_passenger.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_passenger.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_passenger_base_uris.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger_base_uris.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_passenger_base_uris.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_passenger_base_uris.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_php.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_php.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_php_admin.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php_admin.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_php_admin.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_php_admin.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_proxy.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_proxy.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_proxy.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_proxy.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_rack.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rack.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_rack.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rack.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_redirect.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_redirect.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_redirect.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_redirect.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_requestheader.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_requestheader.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_requestheader.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_requestheader.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_require.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_require.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_require.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_require.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_rewrite.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rewrite.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_rewrite.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_rewrite.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_scriptalias.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_scriptalias.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_scriptalias.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_scriptalias.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_security.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_security.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_security.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_security.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_serveralias.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serveralias.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_serveralias.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serveralias.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_serversignature.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serversignature.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_serversignature.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_serversignature.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_setenv.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_setenv.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_setenv.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_setenv.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_ssl.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_ssl.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_ssl.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_ssl.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_sslproxy.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_sslproxy.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_sslproxy.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_sslproxy.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_suexec.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suexec.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_suexec.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suexec.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_suphp.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suphp.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_suphp.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_suphp.erb diff --git a/modules/services/unix/http/apache/templates/vhost/_wsgi.erb b/modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_wsgi.erb similarity index 100% rename from modules/services/unix/http/apache/templates/vhost/_wsgi.erb rename to modules/services/unix/http/apache_kali_compatible/apache/templates/vhost/_wsgi.erb diff --git a/modules/services/unix/http/apache_wheezy/CHANGELOG.md b/modules/services/unix/http/apache_wheezy_compatible/apache/CHANGELOG.md similarity index 100% rename from modules/services/unix/http/apache_wheezy/CHANGELOG.md rename to modules/services/unix/http/apache_wheezy_compatible/apache/CHANGELOG.md diff --git a/modules/services/unix/http/apache_wheezy/CONTRIBUTING.md b/modules/services/unix/http/apache_wheezy_compatible/apache/CONTRIBUTING.md similarity index 100% rename from modules/services/unix/http/apache_wheezy/CONTRIBUTING.md rename to modules/services/unix/http/apache_wheezy_compatible/apache/CONTRIBUTING.md diff --git a/modules/services/unix/http/apache_wheezy/Gemfile b/modules/services/unix/http/apache_wheezy_compatible/apache/Gemfile similarity index 100% rename from modules/services/unix/http/apache_wheezy/Gemfile rename to modules/services/unix/http/apache_wheezy_compatible/apache/Gemfile diff --git a/modules/services/unix/http/apache_wheezy/LICENSE b/modules/services/unix/http/apache_wheezy_compatible/apache/LICENSE similarity index 100% rename from modules/services/unix/http/apache_wheezy/LICENSE rename to modules/services/unix/http/apache_wheezy_compatible/apache/LICENSE diff --git a/modules/services/unix/http/apache_wheezy/NOTICE b/modules/services/unix/http/apache_wheezy_compatible/apache/NOTICE similarity index 100% rename from modules/services/unix/http/apache_wheezy/NOTICE rename to modules/services/unix/http/apache_wheezy_compatible/apache/NOTICE diff --git a/modules/services/unix/http/apache_wheezy/README.md b/modules/services/unix/http/apache_wheezy_compatible/apache/README.md similarity index 100% rename from modules/services/unix/http/apache_wheezy/README.md rename to modules/services/unix/http/apache_wheezy_compatible/apache/README.md diff --git a/modules/services/unix/http/apache_wheezy/Rakefile b/modules/services/unix/http/apache_wheezy_compatible/apache/Rakefile similarity index 100% rename from modules/services/unix/http/apache_wheezy/Rakefile rename to modules/services/unix/http/apache_wheezy_compatible/apache/Rakefile diff --git a/modules/services/unix/http/apache_wheezy/apache_wheezy.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/apache.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/apache_wheezy.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/apache.pp diff --git a/modules/services/unix/http/apache_wheezy/checksums.json b/modules/services/unix/http/apache_wheezy_compatible/apache/checksums.json similarity index 100% rename from modules/services/unix/http/apache_wheezy/checksums.json rename to modules/services/unix/http/apache_wheezy_compatible/apache/checksums.json diff --git a/modules/services/unix/http/apache_wheezy/examples/apache.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/apache.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/apache.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/apache.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/dev.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/dev.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/dev.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/dev.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/init.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/init.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/init.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/init.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/mod_load_params.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/mod_load_params.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/mod_load_params.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/mod_load_params.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/mods.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/mods.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/mods.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/mods.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/mods_custom.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/mods_custom.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/mods_custom.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/mods_custom.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/php.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/php.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/php.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/php.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhost.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhost.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhost_directories.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_directories.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhost_directories.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_directories.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhost_filter.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_filter.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhost_filter.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_filter.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhost_ip_based.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_ip_based.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhost_ip_based.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_ip_based.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhost_proxypass.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_proxypass.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhost_proxypass.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_proxypass.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhost_ssl.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_ssl.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhost_ssl.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhost_ssl.pp diff --git a/modules/services/unix/http/apache_wheezy/examples/vhosts_without_listen.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhosts_without_listen.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/examples/vhosts_without_listen.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/examples/vhosts_without_listen.pp diff --git a/modules/services/unix/http/apache_wheezy/files/httpd b/modules/services/unix/http/apache_wheezy_compatible/apache/files/httpd similarity index 100% rename from modules/services/unix/http/apache_wheezy/files/httpd rename to modules/services/unix/http/apache_wheezy_compatible/apache/files/httpd diff --git a/modules/services/unix/http/apache_wheezy/lib/facter/apache_version.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/facter/apache_version.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/facter/apache_version.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/facter/apache_version.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/parser/functions/bool2httpd.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/parser/functions/bool2httpd.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/parser/functions/bool2httpd.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/parser/functions/enclose_ipv6.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/parser/functions/enclose_ipv6.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/parser/functions/enclose_ipv6.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/parser/functions/enclose_ipv6.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/parser/functions/validate_apache_log_level.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/parser/functions/validate_apache_log_level.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/parser/functions/validate_apache_log_level.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/a2mod.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/a2mod.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/a2mod.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/gentoo.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/gentoo.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/gentoo.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/modfix.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/modfix.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/modfix.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/modfix.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/redhat.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/redhat.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/provider/a2mod/redhat.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/provider/a2mod/redhat.rb diff --git a/modules/services/unix/http/apache_wheezy/lib/puppet/type/a2mod.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/type/a2mod.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/lib/puppet/type/a2mod.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/lib/puppet/type/a2mod.rb diff --git a/modules/services/unix/http/apache_wheezy/manifests/balancer.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/balancer.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/balancer.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/balancer.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/balancermember.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/balancermember.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/balancermember.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/balancermember.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/confd/no_accf.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/confd/no_accf.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/confd/no_accf.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/confd/no_accf.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/custom_config.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/custom_config.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/custom_config.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/custom_config.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/default_confd_files.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/default_confd_files.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/default_confd_files.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/default_confd_files.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/default_mods.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/default_mods.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/default_mods.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/default_mods.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/default_mods/load.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/default_mods/load.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/default_mods/load.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/default_mods/load.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/dev.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/dev.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/dev.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/dev.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/fastcgi/server.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/fastcgi/server.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/fastcgi/server.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/fastcgi/server.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/init.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/init.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/init.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/init.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/listen.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/listen.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/listen.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/listen.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/actions.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/actions.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/actions.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/actions.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/alias.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/alias.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/alias.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/alias.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/auth_basic.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_basic.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/auth_basic.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_basic.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/auth_cas.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_cas.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/auth_cas.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_cas.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/auth_kerb.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_kerb.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/auth_kerb.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_kerb.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/auth_mellon.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_mellon.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/auth_mellon.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/auth_mellon.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/authn_core.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authn_core.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/authn_core.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authn_core.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/authn_dbd.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authn_dbd.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/authn_dbd.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authn_dbd.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/authn_file.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authn_file.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/authn_file.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authn_file.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/authnz_ldap.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authnz_ldap.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/authnz_ldap.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authnz_ldap.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/authz_default.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authz_default.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/authz_default.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authz_default.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/authz_user.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authz_user.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/authz_user.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/authz_user.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/autoindex.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/autoindex.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/autoindex.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/autoindex.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/cache.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cache.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/cache.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cache.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/cgi.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cgi.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/cgi.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cgi.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/cgid.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cgid.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/cgid.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cgid.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/cluster.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cluster.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/cluster.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/cluster.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dav.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dav.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dav.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dav.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dav_fs.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dav_fs.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dav_fs.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dav_fs.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dav_svn.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dav_svn.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dav_svn.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dav_svn.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dbd.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dbd.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dbd.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dbd.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/deflate.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/deflate.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/deflate.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/deflate.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dev.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dev.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dev.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dev.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dir.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dir.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dir.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dir.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/disk_cache.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/disk_cache.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/disk_cache.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/disk_cache.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/dumpio.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dumpio.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/dumpio.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/dumpio.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/env.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/env.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/env.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/env.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/event.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/event.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/event.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/event.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/expires.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/expires.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/expires.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/expires.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/ext_filter.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/ext_filter.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/ext_filter.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/ext_filter.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/fastcgi.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/fastcgi.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/fastcgi.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/fastcgi.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/fcgid.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/fcgid.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/fcgid.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/fcgid.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/filter.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/filter.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/filter.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/filter.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/geoip.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/geoip.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/geoip.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/geoip.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/headers.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/headers.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/headers.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/headers.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/include.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/include.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/include.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/include.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/info.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/info.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/info.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/info.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/itk.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/itk.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/itk.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/itk.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/ldap.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/ldap.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/ldap.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/ldap.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/mime.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/mime.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/mime.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/mime.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/mime_magic.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/mime_magic.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/mime_magic.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/mime_magic.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/negotiation.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/negotiation.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/negotiation.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/negotiation.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/nss.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/nss.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/nss.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/nss.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/pagespeed.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/pagespeed.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/pagespeed.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/pagespeed.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/passenger.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/passenger.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/passenger.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/passenger.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/perl.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/perl.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/perl.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/perl.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/peruser.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/peruser.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/peruser.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/peruser.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/php.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/php.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/php.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/php.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/prefork.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/prefork.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/prefork.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/prefork.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_ajp.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_ajp.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_ajp.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_ajp.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_balancer.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_balancer.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_balancer.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_balancer.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_connect.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_connect.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_connect.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_connect.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_fcgi.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_fcgi.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_fcgi.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_fcgi.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_html.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_html.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_html.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_html.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_http.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_http.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_http.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_http.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/proxy_wstunnel.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_wstunnel.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/proxy_wstunnel.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/proxy_wstunnel.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/python.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/python.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/python.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/python.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/remoteip.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/remoteip.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/remoteip.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/remoteip.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/reqtimeout.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/reqtimeout.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/reqtimeout.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/reqtimeout.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/rewrite.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/rewrite.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/rewrite.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/rewrite.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/rpaf.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/rpaf.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/rpaf.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/rpaf.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/security.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/security.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/security.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/security.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/setenvif.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/setenvif.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/setenvif.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/setenvif.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/shib.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/shib.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/shib.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/shib.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/socache_shmcb.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/socache_shmcb.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/socache_shmcb.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/socache_shmcb.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/speling.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/speling.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/speling.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/speling.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/ssl.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/ssl.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/ssl.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/ssl.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/status.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/status.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/status.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/status.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/suexec.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/suexec.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/suexec.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/suexec.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/suphp.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/suphp.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/suphp.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/suphp.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/userdir.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/userdir.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/userdir.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/userdir.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/version.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/version.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/version.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/version.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/vhost_alias.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/vhost_alias.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/vhost_alias.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/vhost_alias.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/worker.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/worker.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/worker.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/worker.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/wsgi.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/wsgi.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/wsgi.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/wsgi.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mod/xsendfile.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/xsendfile.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mod/xsendfile.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mod/xsendfile.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/mpm.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mpm.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/mpm.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/mpm.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/namevirtualhost.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/namevirtualhost.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/namevirtualhost.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/namevirtualhost.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/package.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/package.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/package.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/package.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/params.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/params.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/params.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/params.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/peruser/multiplexer.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/peruser/multiplexer.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/peruser/multiplexer.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/peruser/multiplexer.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/peruser/processor.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/peruser/processor.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/peruser/processor.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/peruser/processor.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/php.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/php.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/php.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/php.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/proxy.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/proxy.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/proxy.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/proxy.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/python.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/python.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/python.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/python.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/security/rule_link.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/security/rule_link.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/security/rule_link.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/security/rule_link.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/service.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/service.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/service.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/service.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/ssl.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/ssl.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/ssl.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/ssl.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/version.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/version.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/version.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/version.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/vhost.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/vhost.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/vhost.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/vhost.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/vhost/custom.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/vhost/custom.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/vhost/custom.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/vhost/custom.pp diff --git a/modules/services/unix/http/apache_wheezy/manifests/vhosts.pp b/modules/services/unix/http/apache_wheezy_compatible/apache/manifests/vhosts.pp similarity index 100% rename from modules/services/unix/http/apache_wheezy/manifests/vhosts.pp rename to modules/services/unix/http/apache_wheezy_compatible/apache/manifests/vhosts.pp diff --git a/modules/services/unix/http/apache_wheezy/metadata.json b/modules/services/unix/http/apache_wheezy_compatible/apache/metadata.json similarity index 100% rename from modules/services/unix/http/apache_wheezy/metadata.json rename to modules/services/unix/http/apache_wheezy_compatible/apache/metadata.json diff --git a/modules/services/unix/http/apache_wheezy/secgen_metadata.xml b/modules/services/unix/http/apache_wheezy_compatible/apache/secgen_metadata.xml similarity index 100% rename from modules/services/unix/http/apache_wheezy/secgen_metadata.xml rename to modules/services/unix/http/apache_wheezy_compatible/apache/secgen_metadata.xml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/apache_parameters_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/apache_parameters_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/apache_parameters_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/apache_parameters_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/apache_ssl_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/apache_ssl_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/apache_ssl_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/apache_ssl_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/class_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/class_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/class_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/class_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/custom_config_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/custom_config_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/custom_config_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/custom_config_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/default_mods_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/default_mods_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/default_mods_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/default_mods_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/itk_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/itk_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/itk_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/itk_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_dav_svn_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_dav_svn_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_dav_svn_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_deflate_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_deflate_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_deflate_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_deflate_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_fcgid_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_fcgid_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_fcgid_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_fcgid_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_mime_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_mime_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_mime_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_mime_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_negotiation_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_negotiation_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_negotiation_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_negotiation_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_pagespeed_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_pagespeed_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_pagespeed_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_passenger_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_passenger_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_passenger_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_passenger_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_php_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_php_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_php_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_php_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_proxy_html_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_proxy_html_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_proxy_html_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_security_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_security_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_security_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_security_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/mod_suphp_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_suphp_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/mod_suphp_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/mod_suphp_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/centos-7-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/centos-7-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/centos-7-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/centos-70-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/centos-70-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/centos-70-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/centos-70-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-607-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-607-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-607-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-607-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-70rc1-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-70rc1-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-73-i386.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-73-i386.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-73-i386.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-73-i386.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-73-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-73-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-73-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-73-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-8-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-8-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-8-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-82-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-82-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/debian-82-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/debian-82-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/default.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/default.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/default.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/default.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/docker/centos-7.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/docker/centos-7.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/docker/centos-7.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/docker/debian-8.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/docker/debian-8.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/docker/debian-8.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/docker/ubuntu-14.04.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/docker/ubuntu-14.04.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/fedora-18-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/fedora-18-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/suse.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/suse.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/suse.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/suse.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/prefork_worker_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/prefork_worker_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/prefork_worker_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/prefork_worker_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/service_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/service_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/service_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/service_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/version.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/version.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/version.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/version.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/vhost_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/vhost_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/vhost_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/vhost_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/acceptance/vhosts_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/vhosts_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/acceptance/vhosts_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/acceptance/vhosts_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/apache_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/apache_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/apache_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/apache_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/dev_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/dev_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/dev_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/dev_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/alias_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/alias_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/alias_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/alias_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/auth_cas_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/auth_cas_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/auth_cas_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/auth_cas_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/auth_kerb_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/auth_kerb_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/auth_kerb_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/auth_kerb_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/auth_mellon_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/auth_mellon_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/auth_mellon_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/auth_mellon_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/authn_dbd_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/authn_dbd_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/authn_dbd_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/authn_dbd_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/authnz_ldap_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/authnz_ldap_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/authnz_ldap_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/cluster_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/cluster_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/cluster_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/cluster_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/dav_svn_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dav_svn_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/dav_svn_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dav_svn_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/deflate_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/deflate_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/deflate_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/deflate_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/dev_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dev_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/dev_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dev_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/dir_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dir_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/dir_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dir_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/disk_cache.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/disk_cache.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/disk_cache.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/disk_cache.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/disk_cache_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/disk_cache_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/disk_cache_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/disk_cache_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/dumpio_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dumpio_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/dumpio_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/dumpio_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/event_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/event_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/event_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/event_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/expires_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/expires_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/expires_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/expires_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/ext_filter_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/ext_filter_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/ext_filter_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/ext_filter_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/fastcgi_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/fastcgi_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/fastcgi_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/fastcgi_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/fcgid_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/fcgid_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/fcgid_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/fcgid_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/info_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/info_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/info_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/info_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/itk_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/itk_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/itk_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/itk_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/ldap_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/ldap_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/ldap_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/ldap_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/mime_magic_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/mime_magic_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/mime_magic_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/mime_magic_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/mime_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/mime_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/mime_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/mime_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/negotiation_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/negotiation_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/negotiation_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/negotiation_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/pagespeed_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/pagespeed_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/pagespeed_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/pagespeed_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/passenger_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/passenger_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/passenger_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/passenger_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/perl_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/perl_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/perl_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/perl_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/peruser_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/peruser_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/peruser_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/peruser_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/php_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/php_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/php_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/php_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/prefork_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/prefork_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/prefork_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/prefork_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_balancer_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_balancer_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_balancer_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_connect_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_connect_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_connect_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_connect_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_html_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_html_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_html_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_html_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_wstunnel.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_wstunnel.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/proxy_wstunnel.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/proxy_wstunnel.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/python_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/python_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/python_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/python_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/remoteip_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/remoteip_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/remoteip_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/remoteip_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/reqtimeout_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/reqtimeout_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/reqtimeout_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/reqtimeout_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/rpaf_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/rpaf_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/rpaf_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/rpaf_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/security_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/security_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/security_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/security_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/shib_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/shib_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/shib_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/shib_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/speling_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/speling_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/speling_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/speling_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/ssl_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/ssl_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/ssl_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/ssl_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/status_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/status_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/status_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/status_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/suphp_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/suphp_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/suphp_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/suphp_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/worker_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/worker_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/worker_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/worker_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/mod/wsgi_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/wsgi_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/mod/wsgi_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/mod/wsgi_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/params_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/params_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/params_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/params_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/service_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/service_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/service_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/service_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/classes/vhosts_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/vhosts_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/classes/vhosts_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/classes/vhosts_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/balancer_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/balancer_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/balancer_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/balancer_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/balancermember_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/balancermember_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/balancermember_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/balancermember_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/custom_config_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/custom_config_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/custom_config_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/custom_config_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/fastcgi_server_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/fastcgi_server_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/fastcgi_server_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/fastcgi_server_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/mod_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/mod_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/mod_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/mod_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/modsec_link_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/modsec_link_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/modsec_link_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/modsec_link_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/vhost_custom_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/vhost_custom_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/vhost_custom_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/vhost_custom_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/defines/vhost_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/vhost_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/defines/vhost_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/defines/vhost_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/fixtures/files/negotiation.conf b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/fixtures/files/negotiation.conf similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/fixtures/files/negotiation.conf rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/fixtures/files/negotiation.conf diff --git a/modules/services/unix/http/apache_wheezy/spec/fixtures/files/spec b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/fixtures/files/spec similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/fixtures/files/spec rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/fixtures/files/spec diff --git a/modules/services/unix/http/apache_wheezy/spec/fixtures/templates/negotiation.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/fixtures/templates/negotiation.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/fixtures/templates/negotiation.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/fixtures/templates/negotiation.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/spec/spec.opts b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec.opts similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/spec.opts rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec.opts diff --git a/modules/services/unix/http/apache_wheezy/spec/spec_helper.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec_helper.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/spec_helper.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec_helper.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/spec_helper_acceptance.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec_helper_acceptance.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/spec_helper_acceptance.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec_helper_acceptance.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/spec_helper_local.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec_helper_local.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/spec_helper_local.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/spec_helper_local.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/unit/apache_version_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/apache_version_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/unit/apache_version_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/apache_version_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/unit/provider/a2mod/gentoo_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/unit/provider/a2mod/gentoo_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/provider/a2mod/gentoo_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/unit/puppet/parser/functions/bool2httpd_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/unit/puppet/parser/functions/bool2httpd_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb diff --git a/modules/services/unix/http/apache_wheezy/spec/unit/puppet/parser/functions/validate_apache_log_level.rb b/modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb similarity index 100% rename from modules/services/unix/http/apache_wheezy/spec/unit/puppet/parser/functions/validate_apache_log_level.rb rename to modules/services/unix/http/apache_wheezy_compatible/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb diff --git a/modules/services/unix/http/apache_wheezy/templates/confd/no-accf.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/confd/no-accf.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/confd/no-accf.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/confd/no-accf.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/fastcgi/server.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/fastcgi/server.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/fastcgi/server.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/fastcgi/server.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/httpd.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/httpd.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/httpd.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/httpd.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/listen.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/listen.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/listen.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/listen.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/alias.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/alias.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/alias.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/alias.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/auth_cas.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/auth_cas.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/auth_cas.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/auth_cas.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/auth_mellon.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/auth_mellon.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/auth_mellon.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/auth_mellon.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/authn_dbd.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/authn_dbd.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/authn_dbd.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/authn_dbd.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/authnz_ldap.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/authnz_ldap.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/authnz_ldap.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/authnz_ldap.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/autoindex.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/autoindex.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/autoindex.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/autoindex.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/cgid.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/cgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/cgid.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/cgid.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/cluster.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/cluster.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/cluster.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/cluster.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/dav_fs.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/dav_fs.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/dav_fs.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/dav_fs.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/deflate.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/deflate.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/deflate.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/deflate.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/dir.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/dir.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/dir.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/dir.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/disk_cache.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/disk_cache.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/disk_cache.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/disk_cache.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/dumpio.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/dumpio.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/dumpio.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/dumpio.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/event.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/event.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/event.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/event.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/expires.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/expires.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/expires.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/expires.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/ext_filter.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/ext_filter.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/ext_filter.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/ext_filter.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/fastcgi.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/fastcgi.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/fastcgi.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/fastcgi.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/fcgid.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/fcgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/fcgid.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/fcgid.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/geoip.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/geoip.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/geoip.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/geoip.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/info.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/info.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/info.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/info.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/itk.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/itk.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/itk.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/itk.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/ldap.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/ldap.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/ldap.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/ldap.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/load.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/load.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/load.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/load.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/mime.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/mime.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/mime.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/mime.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/mime_magic.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/mime_magic.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/mime_magic.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/mime_magic.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/mpm_event.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/mpm_event.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/mpm_event.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/mpm_event.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/negotiation.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/negotiation.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/negotiation.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/negotiation.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/nss.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/nss.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/nss.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/nss.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/pagespeed.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/pagespeed.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/pagespeed.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/pagespeed.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/passenger.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/passenger.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/passenger.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/passenger.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/peruser.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/peruser.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/peruser.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/peruser.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/php.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/php.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/php.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/php.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/php5.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/php5.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/php5.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/php5.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/prefork.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/prefork.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/prefork.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/prefork.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/proxy.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/proxy.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/proxy.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/proxy.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/proxy_balancer.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/proxy_balancer.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/proxy_balancer.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/proxy_balancer.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/proxy_html.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/proxy_html.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/proxy_html.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/proxy_html.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/remoteip.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/remoteip.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/remoteip.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/remoteip.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/reqtimeout.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/reqtimeout.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/reqtimeout.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/reqtimeout.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/rpaf.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/rpaf.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/rpaf.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/rpaf.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/security.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/security.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/security.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/security.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/security_crs.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/security_crs.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/security_crs.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/security_crs.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/setenvif.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/setenvif.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/setenvif.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/setenvif.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/ssl.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/ssl.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/ssl.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/ssl.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/status.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/status.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/status.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/status.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/suphp.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/suphp.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/suphp.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/suphp.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/unixd_fcgid.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/unixd_fcgid.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/unixd_fcgid.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/unixd_fcgid.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/userdir.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/userdir.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/userdir.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/userdir.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/worker.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/worker.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/worker.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/worker.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/mod/wsgi.conf.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/wsgi.conf.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/mod/wsgi.conf.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/mod/wsgi.conf.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/namevirtualhost.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/namevirtualhost.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/namevirtualhost.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/namevirtualhost.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/ports_header.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/ports_header.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/ports_header.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/ports_header.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_access_log.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_access_log.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_access_log.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_access_log.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_action.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_action.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_action.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_action.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_additional_includes.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_additional_includes.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_additional_includes.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_additional_includes.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_aliases.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_aliases.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_aliases.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_aliases.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_allow_encoded_slashes.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_allow_encoded_slashes.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_allow_encoded_slashes.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_allow_encoded_slashes.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_auth_cas.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_auth_cas.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_auth_cas.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_auth_cas.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_auth_kerb.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_auth_kerb.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_auth_kerb.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_auth_kerb.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_block.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_block.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_block.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_block.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_charsets.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_charsets.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_charsets.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_charsets.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_custom_fragment.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_custom_fragment.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_custom_fragment.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_custom_fragment.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_directories.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_directories.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_directories.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_directories.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_docroot.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_docroot.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_docroot.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_docroot.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_error_document.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_error_document.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_error_document.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_error_document.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_fallbackresource.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_fallbackresource.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_fallbackresource.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_fallbackresource.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_fastcgi.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_fastcgi.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_fastcgi.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_fastcgi.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_file_footer.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_file_footer.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_file_footer.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_file_footer.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_file_header.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_file_header.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_file_header.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_file_header.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_filters.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_filters.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_filters.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_filters.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_header.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_header.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_header.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_header.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_itk.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_itk.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_itk.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_itk.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_jk_mounts.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_jk_mounts.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_jk_mounts.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_jk_mounts.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_keepalive_options.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_keepalive_options.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_keepalive_options.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_keepalive_options.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_logging.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_logging.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_logging.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_logging.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_passenger.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_passenger.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_passenger.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_passenger.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_passenger_base_uris.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_passenger_base_uris.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_passenger_base_uris.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_passenger_base_uris.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_php.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_php.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_php.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_php.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_php_admin.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_php_admin.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_php_admin.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_php_admin.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_proxy.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_proxy.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_proxy.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_proxy.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_rack.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_rack.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_rack.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_rack.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_redirect.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_redirect.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_redirect.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_redirect.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_requestheader.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_requestheader.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_requestheader.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_requestheader.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_require.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_require.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_require.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_require.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_rewrite.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_rewrite.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_rewrite.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_rewrite.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_scriptalias.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_scriptalias.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_scriptalias.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_scriptalias.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_security.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_security.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_security.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_security.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_serveralias.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_serveralias.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_serveralias.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_serveralias.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_serversignature.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_serversignature.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_serversignature.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_serversignature.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_setenv.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_setenv.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_setenv.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_setenv.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_ssl.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_ssl.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_ssl.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_ssl.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_sslproxy.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_sslproxy.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_sslproxy.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_sslproxy.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_suexec.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_suexec.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_suexec.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_suexec.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_suphp.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_suphp.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_suphp.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_suphp.erb diff --git a/modules/services/unix/http/apache_wheezy/templates/vhost/_wsgi.erb b/modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_wsgi.erb similarity index 100% rename from modules/services/unix/http/apache_wheezy/templates/vhost/_wsgi.erb rename to modules/services/unix/http/apache_wheezy_compatible/apache/templates/vhost/_wsgi.erb diff --git a/modules/services/unix/http/parameterised_website/secgen_metadata.xml b/modules/services/unix/http/parameterised_website/secgen_metadata.xml index 3b298c92a..9aeef6228 100644 --- a/modules/services/unix/http/parameterised_website/secgen_metadata.xml +++ b/modules/services/unix/http/parameterised_website/secgen_metadata.xml @@ -51,7 +51,8 @@ - modules/services/unix/http/apache + .*apache + httpd \ No newline at end of file diff --git a/modules/utilities/unix/email_clients/thunderbird/files/profiles.ini b/modules/utilities/unix/email_clients/thunderbird/files/profiles.ini new file mode 100644 index 000000000..d4cb5d0e7 --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/files/profiles.ini @@ -0,0 +1,9 @@ +[General] +StartWithLastProfile=1 + +[Profile0] +Name=default +IsRelative=1 +Path=user.default +Default=1 + diff --git a/modules/utilities/unix/email_clients/thunderbird/files/thunderbird.desktop b/modules/utilities/unix/email_clients/thunderbird/files/thunderbird.desktop new file mode 100644 index 000000000..f12b67fbe --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/files/thunderbird.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Thunderbird +GenericName=Thunderbird email client +Comment=Autostart script +Exec=/usr/bin/thunderbird +Terminal=false +Type=Application +X-GNOME-Autostart-enabled=true \ No newline at end of file diff --git a/modules/utilities/unix/email_clients/thunderbird/manifests/config.pp b/modules/utilities/unix/email_clients/thunderbird/manifests/config.pp new file mode 100644 index 000000000..93e62fe70 --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/manifests/config.pp @@ -0,0 +1,50 @@ +class thunderbird::config { + $secgen_params = secgen_functions::get_parameters($::base64_inputs_file) + $accounts = $secgen_params['accounts'] + $autostart = str2bool($secgen_params['autostart'][0]) + $start_page = $secgen_params['start_page'][0] + + # Setup TB for each user account + $accounts.each |$raw_account| { + $account = parsejson($raw_account) + $username = $account['username'] + + # add user profile + file { ["/home/$username/.thunderbird/", + "/home/$username/.thunderbird/user.default"]: + ensure => directory, + owner => $username, + group => $username, + }-> + file { "/home/$username/thunderbird/profiles.ini": + ensure => file, + source => 'puppet:///modules/thunderbird/profiles.ini', + owner => $username, + group => $username, + }-> + + # set accounts via template: + file { "/home/$username/.thunderbird/user.default/user.js": + ensure => file, + content => template('thunderbird/user.js.erb'), + owner => $username, + group => $username, + } + + # autostart script + if $autostart { + file { ["/home/$username/.config/", "/home/$username/.config/autostart/"]: + ensure => directory, + owner => $username, + group => $username, + } + + file { "/home/$username/.config/autostart/thunderbird.desktop": + ensure => file, + source => 'puppet:///modules/thunderbird/thunderbird.desktop', + owner => $username, + group => $username, + } + } + } +} diff --git a/modules/utilities/unix/email_clients/thunderbird/manifests/install.pp b/modules/utilities/unix/email_clients/thunderbird/manifests/install.pp new file mode 100644 index 000000000..3b4d4e2ef --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/manifests/install.pp @@ -0,0 +1,5 @@ +class thunderbird::install{ + package { 'thunderbird': + ensure => 'installed', + } +} diff --git a/modules/utilities/unix/email_clients/thunderbird/secgen_metadata.xml b/modules/utilities/unix/email_clients/thunderbird/secgen_metadata.xml new file mode 100644 index 000000000..119c7da91 --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/secgen_metadata.xml @@ -0,0 +1,39 @@ + + + + Iceweasel Web Browser + Thomas Shaw + MIT + Installs Iceweasel Web Browser + + web_browser + linux + + Iceweasel Web Browser + GPL + + accounts + autostart + start_page + + + + + + + true + + + + leedsbeckett.ac.uk/csi + + + + update + + + desktop_environment + + diff --git a/modules/utilities/unix/email_clients/thunderbird/templates/user.js.erb b/modules/utilities/unix/email_clients/thunderbird/templates/user.js.erb new file mode 100644 index 000000000..bad9ad765 --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/templates/user.js.erb @@ -0,0 +1,60 @@ +user_pref("mail.account.account1.identities", "id1"); +user_pref("mail.account.account1.server", "server1"); +user_pref("mail.account.account2.server", "server2"); +user_pref("mail.account.lastKey", 2); +user_pref("mail.accountmanager.accounts", "account1,account2"); +user_pref("mail.accountmanager.defaultaccount", "account1"); +user_pref("mail.accountmanager.localfoldersserver", "server2"); +user_pref("mail.append_preconfig_smtpservers.version", 2); +user_pref("mail.attachment.store.version", 1); +user_pref("mail.default_charsets.migrated", 1); +user_pref("mail.displayname.version", 1); +user_pref("mail.folder.views.version", 1); +user_pref("mail.identity.id1.doBcc", false); +user_pref("mail.identity.id1.draft_folder", "mailbox://<%=@username-%>@localhost/Drafts"); +user_pref("mail.identity.id1.drafts_folder_picker_mode", "0"); +user_pref("mail.identity.id1.fcc_folder", "mailbox://<%=@username-%>@localhost/Sent"); +user_pref("mail.identity.id1.fcc_folder_picker_mode", "0"); +user_pref("mail.identity.id1.fullName", "<%=@username-%>"); +user_pref("mail.identity.id1.reply_on_top", 1); +user_pref("mail.identity.id1.smtpServer", "smtp1"); +user_pref("mail.identity.id1.stationery_folder", "mailbox://<%=@username-%>@localhost/Templates"); +user_pref("mail.identity.id1.tmpl_folder_picker_mode", "0"); +user_pref("mail.identity.id1.useremail", "<%=@username-%>@localhost"); +user_pref("mail.identity.id1.valid", true); +user_pref("mail.openMessageBehavior.version", 1); +user_pref("mail.rights.version", 1); +user_pref("mail.root.none", "/home/<%=@username-%>/.thunderbird/user.default/Mail"); +user_pref("mail.root.none-rel", "[ProfD]Mail"); +user_pref("mail.root.pop3", "/home/<%=@username-%>/.thunderbird/user.default/Mail"); +user_pref("mail.root.pop3-rel", "[ProfD]Mail"); +user_pref("mail.server.server1.check_new_mail", true); +user_pref("mail.server.server1.delete_by_age_from_server", true); +user_pref("mail.server.server1.delete_mail_left_on_server", true); +user_pref("mail.server.server1.directory", "/home/<%=@username-%>/.thunderbird/user.default/Mail/localhost"); +user_pref("mail.server.server1.directory-rel", "[ProfD]Mail/localhost"); +user_pref("mail.server.server1.download_on_biff", true); +user_pref("mail.server.server1.hostname", "localhost"); +user_pref("mail.server.server1.leave_on_server", true); +user_pref("mail.server.server1.login_at_startup", true); +user_pref("mail.server.server1.name", "<%=@username-%>@localhost"); +user_pref("mail.server.server1.num_days_to_leave_on_server", 14); +user_pref("mail.server.server1.socketType", 0); +user_pref("mail.server.server1.spamActionTargetAccount", "mailbox://<%=@username-%>@localhost"); +user_pref("mail.server.server1.storeContractID", "@mozilla.org/msgstore/berkeleystore;1"); +user_pref("mail.server.server1.type", "pop3"); +user_pref("mail.server.server1.userName", "<%=@username-%>"); +user_pref("mail.server.server2.directory", "/home/<%=@username-%>/.thunderbird/user.default/Mail/Local Folders"); +user_pref("mail.server.server2.directory-rel", "[ProfD]Mail/Local Folders"); +user_pref("mail.server.server2.hostname", "Local Folders"); +user_pref("mail.server.server2.name", "Local Folders"); +user_pref("mail.server.server2.spamActionTargetAccount", "mailbox://nobody@Local%20Folders"); +user_pref("mail.server.server2.storeContractID", "@mozilla.org/msgstore/berkeleystore;1"); +user_pref("mail.server.server2.type", "none"); +user_pref("mail.server.server2.userName", "nobody"); +user_pref("mail.smtpserver.smtp1.authMethod", 3); +user_pref("mail.smtpserver.smtp1.hostname", "localhost"); +user_pref("mail.smtpserver.smtp1.port", 25); +user_pref("mail.smtpserver.smtp1.try_ssl", 0); +user_pref("mail.smtpserver.smtp1.username", "<%=@username-%>"); +user_pref("mail.smtpservers", "smtp1"); diff --git a/modules/utilities/unix/email_clients/thunderbird/thunderbird.pp b/modules/utilities/unix/email_clients/thunderbird/thunderbird.pp new file mode 100644 index 000000000..cf87fa50d --- /dev/null +++ b/modules/utilities/unix/email_clients/thunderbird/thunderbird.pp @@ -0,0 +1,2 @@ +include iceweasel::install +include iceweasel::config diff --git a/modules/utilities/unix/hackerbot/files/opt_hackerbot/hackerbot.rb b/modules/utilities/unix/hackerbot/files/opt_hackerbot/hackerbot.rb index de8885f31..9fa2b27e2 100644 --- a/modules/utilities/unix/hackerbot/files/opt_hackerbot/hackerbot.rb +++ b/modules/utilities/unix/hackerbot/files/opt_hackerbot/hackerbot.rb @@ -10,11 +10,11 @@ require 'thwait' def check_output_conditions(bot_name, bots, current, lines, m) condition_met = false bots[bot_name]['attacks'][current]['condition'].each do |condition| - if !condition_met && condition.key?('output_matches') && lines =~ /#{condition['output_matches']}/ + if !condition_met && condition.key?('output_matches') && lines =~ /#{condition['output_matches']}/m condition_met = true m.reply "#{condition['message']}" end - if !condition_met && condition.key?('output_not_matches') && lines !~ /#{condition['output_not_matches']}/ + if !condition_met && condition.key?('output_not_matches') && lines !~ /#{condition['output_not_matches']}/m condition_met = true m.reply "#{condition['message']}" end @@ -191,7 +191,7 @@ def read_bots (irc_server_ip_address) on :message, /^(the answer is|answer):? .+$/i do |m| answer = m.message.chomp().split[1].to_i - 1 - answer = m.message.chomp().match(/(the answer is|answer):? (.+)$/i)[2] + answer = m.message.chomp().match(/(?:the )?answer(?: is)?:? (.+)$/i)[1] # current_quiz = bots[bot_name]['current_quiz'] current = bots[bot_name]['current_attack'] @@ -218,7 +218,7 @@ def read_bots (irc_server_ip_address) end correct_answer.chomp! - if answer.match(correct_answer) + if answer.match(/#{correct_answer}/i) m.reply bots[bot_name]['messages']['correct_answer'] m.reply quiz['correct_answer_response'] @@ -242,7 +242,7 @@ def read_bots (irc_server_ip_address) end else - m.reply bots[bot_name]['messages']['incorrect_answer'] + m.reply "#{bots[bot_name]['messages']['incorrect_answer']} (#{answer})" end else m.reply bots[bot_name]['messages']['no_quiz'] diff --git a/modules/utilities/unix/system/handy_cli_tools/manifests/install.pp b/modules/utilities/unix/system/handy_cli_tools/manifests/install.pp index 237509455..23f8c3c8a 100644 --- a/modules/utilities/unix/system/handy_cli_tools/manifests/install.pp +++ b/modules/utilities/unix/system/handy_cli_tools/manifests/install.pp @@ -1,5 +1,5 @@ class handy_cli_tools::install{ - package { ['vim.tiny', 'vim', 'rsync']: + package { ['vim.tiny', 'vim', 'rsync', 'psmisc']: ensure => 'installed', } } diff --git a/scenarios/labs/5_ids_rules.xml b/scenarios/labs/5_ids_rules.xml index 3cbf40df1..6f63989e8 100644 --- a/scenarios/labs/5_ids_rules.xml +++ b/scenarios/labs/5_ids_rules.xml @@ -8,8 +8,15 @@ desktop + + 172.16.0.2 + 172.16.0.3 + 172.16.0.4 + 172.16.0.5 + + - + @@ -88,6 +95,9 @@ accounts + + + @@ -112,13 +122,13 @@ true - http://172.16.0.5 + IP_addresses - 172.16.0.5 + IP_addresses accounts @@ -131,7 +141,11 @@ - + + + IP_addresses + + @@ -166,12 +180,16 @@ - + + + IP_addresses + + web_server - + @@ -184,13 +202,13 @@ - + - + @@ -198,7 +216,11 @@ - + + + IP_addresses + + @@ -223,19 +245,23 @@ hackerbot_access_root_password - 172.16.0.3 + IP_addresses - 172.16.0.4 + IP_addresses - 172.16.0.5 + IP_addresses - + + + IP_addresses + +