diff options
| author | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
| commit | 36fd84c3d17355afa05b519764c37a3e45efc40d (patch) | |
| tree | c6f5dbc4651875a147607c788b37c5c973573330 /templates/vhosts/partials/header_default.erb | |
| parent | ffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff) | |
| parent | 8074127b8d8913314c90c3fe6131d078a858f7b6 (diff) | |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'templates/vhosts/partials/header_default.erb')
| -rw-r--r-- | templates/vhosts/partials/header_default.erb | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb index d6d8c86..cd4d04c 100644 --- a/templates/vhosts/partials/header_default.erb +++ b/templates/vhosts/partials/header_default.erb @@ -1,20 +1,22 @@ Include include.d/defaults.inc <% if vhost_part == :ssl -%> Include include.d/ssl_defaults.inc +<%= scope.function_templatewlv(['apache/vhosts/partials/ssl.erb', + {'configuration' => configuration}]) %> <% end -%> - ServerName <%= servername %> -<% unless serveralias.empty? || (serveralias == 'absent') -%> - ServerAlias <%= serveralias %> + ServerName <%= @servername %> +<% unless @serveralias.empty? || (@serveralias == 'absent') -%> + ServerAlias <%= Array(@serveralias).sort.join(' ') %> <% end -%> -<% unless server_admin.empty? || (server_admin == 'absent') -%> - ServerAdmin <%= server_admin %> +<% unless @server_admin.empty? || (@server_admin == 'absent') -%> + ServerAdmin <%= @server_admin %> <% end -%> -<% unless documentroot == 'really_absent' -%> - DocumentRoot <%= documentroot %>/ +<% unless @documentroot == 'really_absent' -%> + DocumentRoot <%= @documentroot %>/ <% end -%> -<% if default_charset != 'absent' then -%> - AddDefaultCharset <%= default_charset %> +<% if @default_charset != 'absent' -%> + AddDefaultCharset <%= @default_charset %> <% end -%> -<% if passing_extension != 'absent' -%> - DirectoryIndex index.htm index.html index.<%= passing_extension %> +<% if @passing_extension != 'absent' -%> + DirectoryIndex index.htm index.html index.<%= @passing_extension %> <% end -%> |