we need to set the var also vor http parts

16 files changed, 112 insertions, 56 deletions

diff --git a/templates/vhosts/gitweb/gitweb.erb b/templates/vhosts/gitweb/gitweb.erb
index a53120b..570c42b 100644
--- a/templates/vhosts/gitweb/gitweb.erb
+++ b/templates/vhosts/gitweb/gitweb.erb
@@ -1,7 +1,10 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= 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 35188aa..e66981a 100644
--- a/templates/vhosts/perl/perl.erb
+++ b/templates/vhosts/perl/perl.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -99,7 +102,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.pl
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php/php.erb b/templates/vhosts/php/php.erb
index c0e715c..b722b1e 100644
--- a/templates/vhosts/php/php.erb
+++ b/templates/vhosts/php/php.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -105,7 +108,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb
index 304e8b1..0e6faae 100644
--- a/templates/vhosts/php_drupal/php_drupal.erb
+++ b/templates/vhosts/php_drupal/php_drupal.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
@@ -13,10 +16,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 %>
@@ -153,7 +152,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
@@ -174,10 +176,6 @@
 
     <%- 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 %>/">
diff --git a/templates/vhosts/php_gallery2/php_gallery2.erb b/templates/vhosts/php_gallery2/php_gallery2.erb
index b351e9f..5935b44 100644
--- a/templates/vhosts/php_gallery2/php_gallery2.erb
+++ b/templates/vhosts/php_gallery2/php_gallery2.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -121,7 +124,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index 35532da..a0e013d 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -114,19 +117,11 @@
 <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.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= 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') %>
 
@@ -145,10 +140,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 %>/">
diff --git a/templates/vhosts/php_mediawiki/php_mediawiki.erb b/templates/vhosts/php_mediawiki/php_mediawiki.erb
index 6803ed7..12830b5 100644
--- a/templates/vhosts/php_mediawiki/php_mediawiki.erb
+++ b/templates/vhosts/php_mediawiki/php_mediawiki.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -96,7 +99,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb
index 71da476..e72c603 100644
--- a/templates/vhosts/php_silverstripe/php_silverstripe.erb
+++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -75,7 +78,6 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include include.d/defaults.inc
 <%  scope.unsetvar('vhost_part')
   scope.setvar('vhost_part',:ssl) -%> 
   <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
@@ -141,7 +143,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php_simplemachine/php_simplemachine.erb b/templates/vhosts/php_simplemachine/php_simplemachine.erb
index abef976..5316267 100644
--- a/templates/vhosts/php_simplemachine/php_simplemachine.erb
+++ b/templates/vhosts/php_simplemachine/php_simplemachine.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -93,7 +96,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php_spip/php_spip.erb b/templates/vhosts/php_spip/php_spip.erb
index b4542bc..9f93c18 100644
--- a/templates/vhosts/php_spip/php_spip.erb
+++ b/templates/vhosts/php_spip/php_spip.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -105,7 +108,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
@@ -165,10 +171,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_typo3/php_typo3.erb b/templates/vhosts/php_typo3/php_typo3.erb
index 88e47ab..b1a632f 100644
--- a/templates/vhosts/php_typo3/php_typo3.erb
+++ b/templates/vhosts/php_typo3/php_typo3.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
@@ -111,7 +114,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/php_wordpress/php_wordpress.erb b/templates/vhosts/php_wordpress/php_wordpress.erb
index 3b06fae..2811749 100644
--- a/templates/vhosts/php_wordpress/php_wordpress.erb
+++ b/templates/vhosts/php_wordpress/php_wordpress.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -99,7 +102,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
     DirectoryIndex index.htm index.html index.php
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
diff --git a/templates/vhosts/proxy/proxy.erb b/templates/vhosts/proxy/proxy.erb
index b99d685..622dd43 100644
--- a/templates/vhosts/proxy/proxy.erb
+++ b/templates/vhosts/proxy/proxy.erb
@@ -1,7 +1,10 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
index c788fdd..6fc6922 100644
--- a/templates/vhosts/redirect/redirect.erb
+++ b/templates/vhosts/redirect/redirect.erb
@@ -1,7 +1,10 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb
index bbe8527..e8e278b 100644
--- a/templates/vhosts/static/static.erb
+++ b/templates/vhosts/static/static.erb
@@ -1,7 +1,10 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
     <%- if ssl_mode.to_s == 'force' then -%>
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb
index 4b44298..ad5f5e4 100644
--- a/templates/vhosts/webdav/webdav.erb
+++ b/templates/vhosts/webdav/webdav.erb
@@ -4,7 +4,10 @@
 <%- end -%>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>
 
@@ -106,7 +109,10 @@
 <IfDefine !HttpdLocal>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part')
+  scope.setvar('vhost_part',:normal) -%> 
+  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
+<%  scope.unsetvar('vhost_part') -%>
 
 <%= scope.function_template('apache/vhosts/partials/logs.erb') %>