summaryrefslogtreecommitdiff
path: root/templates/vhosts/static/OpenBSD.erb
diff options
context:
space:
mode:
Diffstat (limited to 'templates/vhosts/static/OpenBSD.erb')
-rw-r--r--templates/vhosts/static/OpenBSD.erb10
1 files changed, 2 insertions, 8 deletions
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 -%>