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

This commit is contained in:
Ralf Becker 2011-08-04 08:14:23 +00:00
parent 6a1834ceff
commit cc113b3519

View File

@ -7,8 +7,15 @@
# Version: $Id$
#
# this makes EGroupware available for all vhosts
Alias /egroupware /usr/share/egroupware
# Enable ActiveSync protocol support via eSync app
Alias /Microsoft-Server-ActiveSync /usr/share/egroupware/activesync/index.php
# iOS 4.3+ calendar requires that to autodetect accounts
RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
<Directory /usr/share/egroupware/phpgwapi/ntlm/>
AuthName "NTLM eGroupWare Authentication"
NTLMAuth on
@ -46,7 +53,7 @@ Alias /egroupware /usr/share/egroupware
php_value memory_limit 64M
php_value session.gc_maxlifetime 14400
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_admin_value upload_tmp_dir /tmp
php_value post_max_size 65M