- add index.shtml to default index if we do includ

  es, as well add +Includes to the directory options
  if not yet done
- removed the security rewrite as it is already in the
  defaults.inc!
- removed the enforcement of mod_security

2 files changed, 3 insertions, 11 deletions

diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb
index 1e93756..e990f5e 100644
--- a/templates/vhosts/static/CentOS.erb
+++ b/templates/vhosts/static/CentOS.erb
@@ -12,6 +12,7 @@
 
     <Directory "<%= documentroot %>">
         AllowOverride <%= allow_override %>
+        Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%>
     </Directory>
 
     <IfModule mod_security2.c>
@@ -21,7 +22,4 @@
     <%- unless additional_options == 'absent' then -%>
     <%= additional_options %>
     <%- end -%>
-    RewriteEngine on
-    RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-    RewriteRule .* - [F
 </VirtualHost>
diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb
index c04f372..5dd02ef 100644
--- a/templates/vhosts/static/OpenBSD.erb
+++ b/templates/vhosts/static/OpenBSD.erb
@@ -17,7 +17,7 @@
     <%- if (options.to_s != 'absent' or htpasswd_file.to_s != 'absent') and not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
         <%- unless options.to_s == 'absent' then -%>
-        Options <%= options %> 
+        Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%>
 
         <%- end -%>
         <%- unless htpasswd_file.to_s == 'absent' then -%>
@@ -32,9 +32,6 @@
     <%- unless additional_options.to_s == 'absent' then -%>
     <%= additional_options %>
     <%- end -%>
-    RewriteEngine on
-    RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-    RewriteRule .* - [F]
 </VirtualHost>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
@@ -52,7 +49,7 @@
     <%- if options.to_s != 'absent' or htpasswd_file.to_s != 'absent' then -%>
     <Directory "<%= documentroot %>/">
         <%- unless options.to_s == 'absent' then -%>
-        Options <%= options %> 
+        Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%>
 
         <%- end -%>
         <%- unless htpasswd_file.to_s == 'absent' then -%>
@@ -67,8 +64,5 @@
     <%- unless additional_options.to_s == 'absent' then -%>
     <%= additional_options %>
     <%- end -%>
-    RewriteEngine on
-    RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-    RewriteRule .* - [F]
 </VirtualHost>
 <%- end -%>