diff options
Diffstat (limited to 'templates/vhosts/default.erb')
| -rw-r--r-- | templates/vhosts/default.erb | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/templates/vhosts/default.erb b/templates/vhosts/default.erb index 809cd9b..1ef8023 100644 --- a/templates/vhosts/default.erb +++ b/templates/vhosts/default.erb @@ -1,5 +1,5 @@ <% -vhost_parts = case ssl_mode +vhost_parts = case @ssl_mode when 'only' then [:ssl] when false,'false' then [:normal] else [:normal,:ssl] @@ -7,36 +7,38 @@ end vhost_parts.each do |vhost_part| -%> <VirtualHost *:<%= vhost_part == :ssl ? '443' : '80' %> > -<%= scope.function_templatewlv(['apache/vhosts/partials/header_default.erb', {'vhost_part' => vhost_part } ]) %> +<%= scope.function_templatewlv(['apache/vhosts/partials/header_default.erb', + {'vhost_part' => vhost_part, + 'configuration' => @configuration,}]) %> <%= scope.function_template(['apache/vhosts/partials/logs.erb']) %> - <% if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%> +<% if @run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%> <IfModule mpm_itk_module> - AssignUserId <%= run_uid+" "+run_gid %> + AssignUserId <%= "#{@run_uid} #{@run_gid}" %> </IfModule> - <% elsif run_mode.to_s == 'fcgid' && !(ssl_mode == 'force' && vhost_part == :normal) -%> +<% elsif @run_mode.to_s == 'fcgid' -%> <IfModule mod_fcgid.c> - SuexecUserGroup <%= run_uid+" "+run_gid %> + SuexecUserGroup <%= "#{@run_uid} #{@run_gid}" %> FcgidMaxRequestsPerProcess 5000 - FCGIWrapper /var/www/mod_fcgid-starters/<%= name %>/<%= name %>-starter .<%= passing_extension %> - AddHandler fcgid-script .<%= passing_extension %> + FCGIWrapper /var/www/mod_fcgid-starters/<%= @name %>/<%= @name %>-starter .<%= @passing_extension %> + AddHandler fcgid-script .<%= @passing_extension %> </IfModule> - <% end -%> - <% if ssl_mode == 'force' && vhost_part == :normal -%> +<% end -%> +<% if @ssl_mode == 'force' && vhost_part == :normal -%> RewriteEngine On RewriteCond %{HTTPS} !=on + RewriteCond %{HTTP:X-Forwarded-Proto} !=https RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L] - <% else -%> -<%= scope.function_templatewlv([template_partial, {'vhost_part' => vhost_part } ]) %> - <% end -%> -<%- unless template_partial == 'apache/vhosts/itk_plus/partial.erb' -%> +<% end -%> +<%= scope.function_templatewlv([@template_partial, {'vhost_part' => vhost_part } ]) %> +<% unless @template_partial == 'apache/vhosts/itk_plus/partial.erb' -%> <%= scope.function_template(['apache/vhosts/partials/mod_security.erb']) %> <% end -%> -<% unless additional_options.to_s == 'absent' -%> - <%= additional_options %> +<% unless @additional_options.to_s == 'absent' -%> + <%= @additional_options %> <% end -%> </VirtualHost> <% end -%> |