summaryrefslogtreecommitdiff
path: root/templates/vhosts/static
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-12-05 18:16:01 +0000
committermh <mh@immerda.ch>2008-12-05 18:16:01 +0000
commitba840ab806ed2ea3bcf02f5318c08c51212dfdc6 (patch)
tree8c977ee0d4a044c41657b7f57c20d3e7131bf35e /templates/vhosts/static
parentded5106de8e6fef521343f6db6662641992a3f0d (diff)
correct test
Diffstat (limited to 'templates/vhosts/static')
-rw-r--r--templates/vhosts/static/OpenBSD.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb
index 5dd02ef..ce5e6b1 100644
--- a/templates/vhosts/static/OpenBSD.erb
+++ b/templates/vhosts/static/OpenBSD.erb
@@ -16,7 +16,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 -%>
+ <%- unless options.to_s == 'absent' or not do_includes.to_s == 'true' then -%>
Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%>
<%- end -%>
@@ -48,7 +48,7 @@
CustomLog <%= logdir %>/access_log combined
<%- if options.to_s != 'absent' or htpasswd_file.to_s != 'absent' then -%>
<Directory "<%= documentroot %>/">
- <%- unless options.to_s == 'absent' then -%>
+ <%- unless options.to_s == 'absent' or not do_includes.to_s == 'true' then -%>
Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%>
<%- end -%>