diff options
| author | mh <mh@immerda.ch> | 2008-11-07 18:48:01 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-11-07 18:48:01 +0000 |
| commit | cb859392d1086afb0784a73339ca8120ea9d9c9f (patch) | |
| tree | f61127e8ec9b2e02fa0ae9ce815fdd4f20967208 /templates | |
| parent | d5cd38b7e13d073ef48b49b11ceaac55dff23214 (diff) | |
added additional options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 92f68b4..6e991be 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -23,8 +23,7 @@ SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %> </IfModule> - - <%- unless additional_options == 'absent' then -%> + <%- unless additional_options.to_s == 'absent' then -%> <%= additional_options %> <%- end -%> </VirtualHost> diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb index 9d543a2..7751c6d 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -13,6 +13,10 @@ <%- if ssl_mode.to_s=='force' then %> Redirect permanent / https://<%= servername %>/ <%- end %> + + <%- unless additional_options.to_s == 'absent' then -%> + <%= additional_options %> + <%- end -%> </VirtualHost> <%- unless ssl_mode.to_s == 'false' then %> <VirtualHost *:443> @@ -26,5 +30,9 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined + + <%- unless additional_options.to_s == 'absent' then -%> + <%= additional_options %> + <%- end -%> </VirtualHost> <%- end %> |