From ba840ab806ed2ea3bcf02f5318c08c51212dfdc6 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 5 Dec 2008 18:16:01 +0000
Subject: correct test

---
 templates/vhosts/perl/CentOS.erb    | 2 +-
 templates/vhosts/php/CentOS.erb     | 2 +-
 templates/vhosts/static/OpenBSD.erb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb
index d2b768f..9a7a1dd 100644
--- a/templates/vhosts/perl/CentOS.erb
+++ b/templates/vhosts/perl/CentOS.erb
@@ -17,7 +17,7 @@
     <%- end -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
-        <%- unless options.to_s == 'absent' or do_includes.to_s == 'true' 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 -%>
         <%- unless htpasswd_file.to_s == 'absent' then -%>
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb
index e89db77..4dbe1f4 100644
--- a/templates/vhosts/php/CentOS.erb
+++ b/templates/vhosts/php/CentOS.erb
@@ -12,7 +12,7 @@
 
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
-        <%- unless options.to_s == 'absent' or do_includes.to_s == 'true' 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 -%>
         <%- unless htpasswd_file.to_s == 'absent' then -%>
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 -%>
-- 
cgit v1.2.3