diff options
| author | mh <mh@immerda.ch> | 2008-11-08 22:16:41 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-11-08 22:16:41 +0000 |
| commit | 13f7ebd2da2de6b6e1910e6c2f767289dfd1cd5f (patch) | |
| tree | 0a97c293f2ea75a66f591031d238a2ce0300e186 /templates/vhosts/static | |
| parent | 44833fe58ee3d5479563b84f0d199ebc04991c45 (diff) | |
only set directory options if we don't redirect
Diffstat (limited to 'templates/vhosts/static')
| -rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 4 |
1 files changed, 2 insertions, 2 deletions
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 %> |