From 13f7ebd2da2de6b6e1910e6c2f767289dfd1cd5f Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Nov 2008 22:16:41 +0000
Subject: only set directory options if we don't redirect

---
 templates/vhosts/static/OpenBSD.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb
index 8f04ad2..1c2498b 100644
--- a/templates/vhosts/static/OpenBSD.erb
+++ b/templates/vhosts/static/OpenBSD.erb
@@ -10,11 +10,11 @@
     ErrorLog <%= logdir %>/error_log
     CustomLog <%= logdir %>/access_log combined
 
-    <%- if ssl_mode.to_s=='force' then -%>
+    <%- if ssl_mode.to_s == 'force' then -%>
     Redirect permanent / https://<%= servername %>/
     <%- end -%>
 
-    <%- if options.to_s != 'absent' or htpasswd_file.to_s != 'absent' then -%>
+    <%- 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 %> 
-- 
cgit v1.2.3