From 58847f6375cffe9c1018a7b51d5062b86796a534 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 18 May 2011 00:13:25 +0200
Subject: move header to partials

---
 templates/vhosts/php_wordpress/php_wordpress.erb | 72 ++++--------------------
 1 file changed, 10 insertions(+), 62 deletions(-)

(limited to 'templates/vhosts/php_wordpress')

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') %>
 
@@ -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>
@@ -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') %>
 
@@ -152,10 +117,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 == 'static-itk' then -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
@@ -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 %>/">
-- 
cgit v1.2.3