From cc113b35191fa62cfc20ed06984136dc46689dd8 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 4 Aug 2011 08:14:23 +0000 Subject: [PATCH] merged latest changes from doc/rpm-build/apache.conf --- phpgwapi/ntlm/egroupware.conf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/phpgwapi/ntlm/egroupware.conf b/phpgwapi/ntlm/egroupware.conf index 7bc6849902..a32ba4a81e 100644 --- a/phpgwapi/ntlm/egroupware.conf +++ b/phpgwapi/ntlm/egroupware.conf @@ -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 + 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