summaryrefslogtreecommitdiff
path: root/templates/vhosts/partials/header_default.erb
diff options
context:
space:
mode:
Diffstat (limited to 'templates/vhosts/partials/header_default.erb')
-rw-r--r--templates/vhosts/partials/header_default.erb15
1 files changed, 9 insertions, 6 deletions
diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb
index 32eb006..05b2122 100644
--- a/templates/vhosts/partials/header_default.erb
+++ b/templates/vhosts/partials/header_default.erb
@@ -1,12 +1,15 @@
Include include.d/defaults.inc
- <% if vhost_part == :ssl -%>
+<% if vhost_part == :ssl -%>
Include include.d/ssl_defaults.inc
- <% end -%>
+<% end -%>
ServerName <%= servername %>
- <% unless serveralias.to_s.empty? || (serveralias.to_s == 'absent') -%>
+<% unless serveralias.to_s.empty? || (serveralias.to_s == 'absent') -%>
ServerAlias <%= serveralias %>
- <% end -%>
- <% unless server_admin.to_s.empty? || (server_admin.to_s == 'absent') -%>
+<% end -%>
+<% unless server_admin.to_s.empty? || (server_admin.to_s == 'absent') -%>
ServerAdmin <%= server_admin %>
- <% end -%>
+<% end -%>
DocumentRoot <%= documentroot %>/
+<% if default_charset.to_s != 'absent' then -%>
+ AddDefaultCharset <%= default_charset %>
+<% end -%> \ No newline at end of file