From ef49b7e5ae53355012e8e570132d0514a61a6a81 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Wed, 12 Nov 2008 17:38:41 -0500
Subject: [PATCH] changed var-names for ownerrordocs option added www.-Subdomain option

---
 server/conf/vhost.conf.master |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index e1f6d53..e7e1e90 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -13,7 +13,7 @@
   ServerAdmin webmaster@<tmpl_var name='domain'>
 
   ErrorLog <tmpl_var name='document_root'>/log/error.log
-<tmpl_if name='errordocs' op='==' value='y'>
+<tmpl_if name='is_errordocs'>
 
 	ErrorDocument 400 /error/invalidSyntax.html
 	ErrorDocument 401 /error/authorizationRequired.html
@@ -87,9 +87,9 @@
 <tmpl_if name='php' op='!=' value=''>
 
   php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"	
+  php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
+  php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
   #php_admin_value open_basedir <tmpl_var name='document_root'>:/usr/share/php5
-  #php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
-  #php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
 </tmpl_if>
 <tmpl_var name='apache_directives'>
 </VirtualHost>
@@ -112,7 +112,7 @@
   
   ErrorLog <tmpl_var name='document_root'>/log/error.log
 
-<tmpl_if name='errordocs' op='==' value='y'>
+<tmpl_if name='is_errordocs'>
 	ErrorDocument 400 /error/invalidSyntax.html
 	ErrorDocument 401 /error/authorizationRequired.html
 	ErrorDocument 403 /error/forbidden.html
@@ -172,9 +172,9 @@
 <tmpl_if name='php' op='!=' value=''>
 
   php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"	
+  php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
+  php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
   #php_admin_value open_basedir <tmpl_var name='document_root'>:/usr/share/php5
-  #php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
-  #php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
 </tmpl_if>
 
 <tmpl_var name='apache_directives'>

--
Gitblit v1.9.1