From 5dee0b15be318a56d45b840d9d6e97f77ac09c5b Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Fri, 03 Oct 2008 11:14:55 -0400
Subject: [PATCH]
---
server/conf/vhost.conf.master | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index de41fc9..7c069a6 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -13,8 +13,8 @@
ServerAdmin webmaster@<tmpl_var name='domain'>
ErrorLog <tmpl_var name='document_root'>/log/error.log
-
<tmpl_if name='errordocs' op='==' value='y'>
+
ErrorDocument 400 /error/invalidSyntax.html
ErrorDocument 401 /error/authorizationRequired.html
ErrorDocument 403 /error/forbidden.html
@@ -22,8 +22,8 @@
ErrorDocument 405 /error/methodNotAllowed.html
ErrorDocument 500 /error/internalServerError.html
ErrorDocument 503 /error/overloaded.html
+</tmpl_if>
-</tmpl_if>
<Directory {tmpl_var name='web_document_root_www'}>
Options None
AllowOverride Indexes AuthConfig Limit FileInfo
@@ -78,20 +78,23 @@
RewriteEngine on
<tmpl_loop name="redirects">
-
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
</tmpl_loop>
</tmpl_if>
+<tmpl_if name='php' op='!=' value=''>
+ php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
+ #php_admin_value open_basedir <tmpl_var name='web_document_root'>:/usr/share/php5
+ php_admin_value upload_tmp_dir <tmpl_var name='web_document_root'>/tmp
+ php_admin_value session.save_path <tmpl_var name='web_document_root'>/tmp
+</tmpl_if>
<tmpl_var name='apache_directives'>
-
</VirtualHost>
<tmpl_if name='ssl_enabled'>
-
<IfModule mod_ssl.c>
###########################################################
# SSL Vhost
@@ -106,7 +109,7 @@
ServerAdmin webmaster@<tmpl_var name='domain'>
ErrorLog <tmpl_var name='document_root'>/log/error.log
-
+
<tmpl_if name='errordocs' op='==' value='y'>
ErrorDocument 400 /error/invalidSyntax.html
ErrorDocument 401 /error/authorizationRequired.html
@@ -164,6 +167,13 @@
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
</tmpl_loop>
</tmpl_if>
+<tmpl_if name='php' op='!=' value=''>
+
+ php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
+ #php_admin_value open_basedir <tmpl_var name='web_document_root'>:/usr/share/php5
+ php_admin_value upload_tmp_dir <tmpl_var name='web_document_root'>/tmp
+ php_admin_value session.save_path <tmpl_var name='web_document_root'>/tmp
+</tmpl_if>
</VirtualHost>
</IfModule>
--
Gitblit v1.9.1