diff options
Diffstat (limited to 'templates/vhosts/partials/header_default.erb')
| -rw-r--r-- | templates/vhosts/partials/header_default.erb | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb index 7d43bde..f454bdf 100644 --- a/templates/vhosts/partials/header_default.erb +++ b/templates/vhosts/partials/header_default.erb @@ -1,13 +1,12 @@ - Include include.d/defaults.inc - <%- if @vhost_part == :ssl %> - Include include.d/ssl_defaults.inc - <%- end %> - - 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 -%> - DocumentRoot <%= documentroot %>/ + Include include.d/defaults.inc + <%- if vhost_part == :ssl %> + Include include.d/ssl_defaults.inc + <%- end %> + ServerName <%= servername %> + <%- unless (serveralias.to_s.empty? || serveralias.to_s == 'absent' -%> + ServerAlias <%= serveralias %> + <%- end -%> + <%- unless server_admin.to_s.empty? || (server_admin.to_s == 'absent') -%> + ServerAdmin <%= server_admin %> + <%- end -%> + DocumentRoot <%= documentroot %>/ |