diff options
| author | mh <mh@immerda.ch> | 2011-05-17 23:42:56 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-05-17 23:42:56 +0200 |
| commit | 29517a83414f478a0e28a9fc57b178e35e9ba112 (patch) | |
| tree | fcd3bd708145ae86649df407cda0cd49f238f999 /templates/vhosts/partials | |
| parent | 28540105eb441ee8f5c9c935d368db5ef582f0b9 (diff) | |
this is now in the include file
Diffstat (limited to 'templates/vhosts/partials')
| -rw-r--r-- | templates/vhosts/partials/header_default.erb | 15 |
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 |