diff options
| author | mh <mh@immerda.ch> | 2008-12-05 18:16:01 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-12-05 18:16:01 +0000 |
| commit | ba840ab806ed2ea3bcf02f5318c08c51212dfdc6 (patch) | |
| tree | 8c977ee0d4a044c41657b7f57c20d3e7131bf35e | |
| parent | ded5106de8e6fef521343f6db6662641992a3f0d (diff) | |
correct test
| -rw-r--r-- | templates/vhosts/perl/CentOS.erb | 2 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 2 | ||||
| -rw-r--r-- | 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 -%> |