move header to partials

16 files changed, 140 insertions, 789 deletions

diff --git a/templates/vhosts/gitweb/gitweb.erb b/templates/vhosts/gitweb/gitweb.erb
index 6024d65..a53120b 100644
--- a/templates/vhosts/gitweb/gitweb.erb
+++ b/templates/vhosts/gitweb/gitweb.erb
@@ -1,18 +1,8 @@
 # <%= 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 -%>
-    DocumentRoot <%= documentroot %>/
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-    <%- 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 -%>
@@ -53,19 +43,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 -%>
-    DocumentRoot <%= documentroot %>/
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-    <%- 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') %>
 
diff --git a/templates/vhosts/perl/perl.erb b/templates/vhosts/perl/perl.erb
index ca46e80..35188aa 100644
--- a/templates/vhosts/perl/perl.erb
+++ b/templates/vhosts/perl/perl.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -66,23 +53,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
@@ -123,20 +99,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.pl
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -155,10 +119,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -192,20 +152,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.pl
-    <%- end -%>
 
     ProxyPreserveHost On
     ProxyRequests off
@@ -218,10 +169,6 @@
     ProxyPassReverse / https://127.0.0.1/
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- unless run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php/php.erb b/templates/vhosts/php/php.erb
index 851bd52..c0e715c 100644
--- a/templates/vhosts/php/php.erb
+++ b/templates/vhosts/php/php.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -29,10 +20,6 @@
     </IfModule>
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
@@ -69,17 +56,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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
 
@@ -89,10 +69,6 @@
     </IfModule>
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
@@ -129,19 +105,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -160,10 +125,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -187,20 +148,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -214,10 +166,6 @@
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
 
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb
index 9fbda55..304e8b1 100644
--- a/templates/vhosts/php_drupal/php_drupal.erb
+++ b/templates/vhosts/php_drupal/php_drupal.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
@@ -90,23 +81,13 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
 
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -172,19 +153,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -249,20 +219,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -275,10 +236,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php_gallery2/php_gallery2.erb b/templates/vhosts/php_gallery2/php_gallery2.erb
index d936445..b351e9f 100644
--- a/templates/vhosts/php_gallery2/php_gallery2.erb
+++ b/templates/vhosts/php_gallery2/php_gallery2.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -77,23 +64,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -145,19 +121,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -176,10 +141,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -213,20 +174,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -239,10 +191,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index b83d910..35532da 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -78,24 +65,13 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
 
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -207,20 +183,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -233,10 +200,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php_mediawiki/php_mediawiki.erb b/templates/vhosts/php_mediawiki/php_mediawiki.erb
index e8252b9..6803ed7 100644
--- a/templates/vhosts/php_mediawiki/php_mediawiki.erb
+++ b/templates/vhosts/php_mediawiki/php_mediawiki.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -64,24 +51,13 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
 
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -120,19 +96,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -151,10 +116,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -178,20 +139,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -205,10 +157,6 @@
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
 
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb
index dcc40aa..71da476 100644
--- a/templates/vhosts/php_silverstripe/php_silverstripe.erb
+++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -27,10 +18,6 @@
     RedirectMatch /admin(.*) https://<%= servername %>/admin$1
     RedirectMatch /Security(.*) https://<%= servername %>/Security$1
 
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -89,22 +76,12 @@
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -164,19 +141,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -199,10 +165,6 @@
     RedirectMatch /admin(.*) https://<%= servername %>/admin$1
     RedirectMatch /Security(.*) https://<%= servername %>/Security$1
 
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -243,19 +205,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -268,10 +222,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php_simplemachine/php_simplemachine.erb b/templates/vhosts/php_simplemachine/php_simplemachine.erb
index df04f77..abef976 100644
--- a/templates/vhosts/php_simplemachine/php_simplemachine.erb
+++ b/templates/vhosts/php_simplemachine/php_simplemachine.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -63,23 +50,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -117,19 +93,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -148,10 +113,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -175,20 +136,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -201,10 +153,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php_spip/php_spip.erb b/templates/vhosts/php_spip/php_spip.erb
index 644c743..b4542bc 100644
--- a/templates/vhosts/php_spip/php_spip.erb
+++ b/templates/vhosts/php_spip/php_spip.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -69,23 +56,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -129,19 +105,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -160,10 +125,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -187,20 +148,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
diff --git a/templates/vhosts/php_typo3/php_typo3.erb b/templates/vhosts/php_typo3/php_typo3.erb
index fd7d530..88e47ab 100644
--- a/templates/vhosts/php_typo3/php_typo3.erb
+++ b/templates/vhosts/php_typo3/php_typo3.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
@@ -22,10 +13,6 @@
     RewriteCond %{HTTPS} !=on
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -76,23 +63,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -135,19 +111,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -166,10 +131,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -202,20 +163,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -228,10 +180,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
diff --git a/templates/vhosts/php_wordpress/php_wordpress.erb b/templates/vhosts/php_wordpress/php_wordpress.erb
index b8d7b5e..ef1fd82 100644
--- a/templates/vhosts/php_wordpress/php_wordpress.erb
+++ b/templates/vhosts/php_wordpress/php_wordpress.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -65,23 +52,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -122,19 +98,8 @@
 <IfDefine !HttpdLocal>
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -153,10 +118,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
@@ -180,20 +141,11 @@
 
 <%- 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 -%>
-    <%- if run_mode.to_s == 'static-itk' -%>
-    DocumentRoot <%= documentroot %>/
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:ssl) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -206,10 +158,6 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
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') %>
 
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
index c9729d3..c788fdd 100644
--- a/templates/vhosts/redirect/redirect.erb
+++ b/templates/vhosts/redirect/redirect.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 -%>
@@ -23,15 +16,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') %>
 
diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb
index 287f413..bbe8527 100644
--- a/templates/vhosts/static/static.erb
+++ b/templates/vhosts/static/static.erb
@@ -1,15 +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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
@@ -40,22 +32,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb
index 61ac41d..4b44298 100644
--- a/templates/vhosts/webdav/webdav.erb
+++ b/templates/vhosts/webdav/webdav.erb
@@ -4,16 +4,7 @@
 <%- end -%>
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -23,10 +14,7 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
 
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
@@ -69,23 +57,12 @@
 
 <%- 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 -%>
-    DocumentRoot <%= documentroot %>/
+<%  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') %>
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
 
     <IfModule mpm_itk_module>
@@ -129,15 +106,7 @@
 <IfDefine !HttpdLocal>
 <%- 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') %>
 
@@ -152,10 +121,6 @@
     RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
     <%- end -%>
-    <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
-
-    <%- end -%>
 <%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
 
     <%- unless additional_options.to_s == 'absent' then -%>
@@ -166,16 +131,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') %>
 
@@ -184,10 +143,6 @@
     SSLProxyEngine On
     ProxyPass / https://127.0.0.1/
     ProxyPassReverse / https://127.0.0.1/
-    <%- if default_charset.to_s != 'absent' then -%>
-
-    AddDefaultCharset <%= default_charset %>
-    <%- end -%>
 
 <%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>