diff options
| author | mh <mh@immerda.ch> | 2011-05-18 00:13:25 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-05-18 00:13:25 +0200 |
| commit | 58847f6375cffe9c1018a7b51d5062b86796a534 (patch) | |
| tree | 95d17096061cf4ca72eac1494cfdb6b4e3204f23 /templates/vhosts/proxy | |
| parent | 29517a83414f478a0e28a9fc57b178e35e9ba112 (diff) | |
move header to partials
Diffstat (limited to 'templates/vhosts/proxy')
| -rw-r--r-- | templates/vhosts/proxy/proxy.erb | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/templates/vhosts/proxy/proxy.erb b/templates/vhosts/proxy/proxy.erb index d89fb80..b99d685 100644 --- a/templates/vhosts/proxy/proxy.erb +++ b/templates/vhosts/proxy/proxy.erb @@ -1,14 +1,7 @@ # <%= servername %> <%- unless ssl_mode.to_s == 'only' then -%> <VirtualHost *:80> - Include include.d/defaults.inc - ServerName <%= servername %> - <%- unless serveralias.to_s.empty? then -%> - ServerAlias <%= serveralias %> - <%- end -%> - <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> - ServerAdmin <%= server_admin %> - <%- end -%> +<%= scope.function_template('apache/vhosts/partials/header_default.erb') %> <%= scope.function_template('apache/vhosts/partials/logs.erb') %> <%- if ssl_mode.to_s == 'force' then -%> @@ -36,15 +29,10 @@ <%- unless ssl_mode.to_s == 'false' then -%> <VirtualHost *:443> - Include include.d/defaults.inc - Include include.d/ssl_defaults.inc - ServerName <%= servername %> - <%- unless serveralias.to_s.empty? then -%> - ServerAlias <%= serveralias %> - <%- end -%> - <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> - ServerAdmin <%= server_admin %> - <%- end -%> +<% scope.unsetvar('vhost_part') + scope.setvar('vhost_part',:ssl) -%> + <%= scope.function_template('apache/vhosts/partials/header_default.erb') %> +<% scope.unsetvar('vhost_part') -%> <%= scope.function_template('apache/vhosts/partials/logs.erb') %> |