merged latest changes from doc/rpm-build/apache.conf

This commit is contained in:
Ralf Becker 2011-08-04 08:37:09 +00:00
parent 6d564002ad
commit 049bf315ca

View File

@ -7,8 +7,12 @@
# Version: $Id$ # Version: $Id$
# #
# this makes EGroupware available for all vhosts
Alias /egroupware /usr/share/egroupware Alias /egroupware /usr/share/egroupware
# iOS 4.3+ calendar requires that to autodetect accounts
RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
<Directory /usr/share/egroupware/phpgwapi/ntlm/> <Directory /usr/share/egroupware/phpgwapi/ntlm/>
AuthName "NTLM eGroupWare Authentication" AuthName "NTLM eGroupWare Authentication"
NTLMAuth on NTLMAuth on
@ -46,7 +50,7 @@ Alias /egroupware /usr/share/egroupware
php_value memory_limit 64M php_value memory_limit 64M
php_value session.gc_maxlifetime 14400 php_value session.gc_maxlifetime 14400
php_value include_path .:/usr/share/pear php_value include_path .:/usr/share/pear
php_admin_value open_basedir /usr/share/egroupware:/var/lib/egroupware:/tmp:/usr/share/pear:/usr/bin/zip:/usr/share/jpgraph:/usr/bin/tnef:/usr/bin/aspell php_admin_value open_basedir /usr/share/egroupware:/var/lib/egroupware:/tmp:/usr/share/pear:/usr/bin/zip:/usr/share/jpgraph:/usr/bin/tnef
php_value upload_max_filesize 64M php_value upload_max_filesize 64M
php_admin_value upload_tmp_dir /tmp php_admin_value upload_tmp_dir /tmp
php_value post_max_size 65M php_value post_max_size 65M