diff options
| author | mh <mh@immerda.ch> | 2012-06-08 12:09:39 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-08 12:09:39 -0300 |
| commit | 9cbf2fafee3f4623b75d1a6b70458ab097e64924 (patch) | |
| tree | 82a619d81198ddd49cb5df5f1116281904e08023 /templates/vhosts/default.erb | |
| parent | edc2afe65136d49501b6aaeb805269b3f7bb141f (diff) | |
fix dynamic scope variables, function access
Diffstat (limited to 'templates/vhosts/default.erb')
| -rw-r--r-- | templates/vhosts/default.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/vhosts/default.erb b/templates/vhosts/default.erb index 9342d06..62edf69 100644 --- a/templates/vhosts/default.erb +++ b/templates/vhosts/default.erb @@ -10,9 +10,9 @@ vhost_parts.each do |vhost_part| -%> <VirtualHost *:<%= vhost_part == :ssl ? '443' : '80' %> > -<%= scope.function_template('apache/vhosts/partials/header_default.erb') %> +<%= scope.function_template(['apache/vhosts/partials/header_default.erb']) %> -<%= scope.function_template('apache/vhosts/partials/logs.erb') %> +<%= scope.function_template(['apache/vhosts/partials/logs.erb']) %> <% if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%> <IfModule mpm_itk_module> @@ -33,13 +33,13 @@ vhost_parts.each do |vhost_part| RewriteCond %{HTTPS} !=on RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L] <% else -%> -<%= scope.function_template(template_partial) %> +<%= scope.function_template([template_partial]) %> <% end -%> <%- unless template_partial == 'apache/vhosts/itk_plus/partial.erb' -%> -<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %> +<%= scope.function_template(['apache/vhosts/partials/mod_security.erb']) %> <% end -%> <% unless additional_options.to_s == 'absent' -%> <%= additional_options %> <% end -%> </VirtualHost> -<% end -%>
\ No newline at end of file +<% end -%> |