diff options
| author | mh <mh@immerda.ch> | 2008-12-06 12:45:55 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-12-06 12:45:55 +0000 |
| commit | 2c5ca964b2e1d027d8d365cae14d156bf6f0ab3b (patch) | |
| tree | 0caed7b5b2655483c408f5850f5cd927bbab387c | |
| parent | c3efcc89935af43f1ebf13d4185bae3892777365 (diff) | |
fixing ssl_mode decision, still set the directory stuff
| -rw-r--r-- | templates/vhosts/perl/CentOS.erb | 6 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 2 | ||||
| -rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb index f02795f..2ecb2a4 100644 --- a/templates/vhosts/perl/CentOS.erb +++ b/templates/vhosts/perl/CentOS.erb @@ -21,7 +21,7 @@ AssignUserId <%= run_uid+" "+run_gid %> </IfModule> <%- end -%> - <%- if (options.to_s != 'absent' or htpasswd_file.to_s != 'absent') and not ssl_mode.to_s == 'force' then -%> + <%- if not ssl_mode.to_s == 'force' then -%> <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> @@ -36,7 +36,6 @@ <%- end -%> </Directory> - ScriptAlias /cgi-bin/ <%= cgi_binpath %>/ <%- unless htpasswd_file.to_s == 'absent' then -%> <Directory "<%= cgi_binpath %>/"> AuthType Basic @@ -45,8 +44,9 @@ require valid-user </Directory> <%- end -%> - + ScriptAlias /cgi-bin/ <%= cgi_binpath %>/ <%- end -%> + <IfModule mod_security2.c> SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %> </IfModule> diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index e957f07..28a8271 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -21,7 +21,7 @@ AssignUserId <%= run_uid+" "+run_gid %> </IfModule> <%- end -%> - <%- if (options.to_s != 'absent' or htpasswd_file.to_s != 'absent') and not ssl_mode.to_s == 'force' then -%> + <%- if not ssl_mode.to_s == 'force' then -%> <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb index 9aee749..5abbd5c 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -16,7 +16,7 @@ Redirect permanent / https://<%= servername %>/ <%- end -%> - <%- if (options.to_s != 'absent' or htpasswd_file.to_s != 'absent') and not ssl_mode.to_s == 'force' then -%> + <%- if not ssl_mode.to_s == 'force' then -%> <Directory "<%= documentroot %>/"> <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%> |