Multi-domain (server configuration) support for caldav, carddav and imap.

INSTALL

@@ -29,16 +29,16 @@ http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html
 
 Additional php packages
 ----------------------
-To use the full featureset of Z-Push 2 and the z-push-top command line utility, 
-additional php packages are required. These provide SOAP support, access to 
-process control and shared memory. 
+To use the full featureset of Z-Push 2 and the z-push-top command line utility,
+additional php packages are required. These provide SOAP support, access to
+process control and shared memory.
 
 These packages vary in names between the distributions.
 - Generally install the packages:                   php-cli php-soap 
-- On Suse (SLES & OpenSuse) install the packages:   php5 php5-soap php5-pcntl php5-sysvshm php5-sysvsem
+- On Suse (SLES & OpenSuse) install the packages:   php53 php53-soap php53-pcntl php53-sysvshm php53-sysvsem php53-posix
 - On RHEL based systems install the package:        php-cli php-soap php-process
-  To install this package you need to add an extra channel subscription from the 
-  RHEL Server Optional channel.
+  In order to install these packages you need to add an extra channel subscription
+  from the RHEL Server Optional channel.
 
 
 How to install
@@ -112,7 +112,7 @@ z-push directory so these settings are considered only there.
         php_flag short_open_tag on
     </Directory>
 
-If you don't set this up correctly, you will not be 
+If you don't set this up correctly, you will not be
 able to login correctly via z-push.
 
 Please also set a memory_limit for php to 128M in php.ini.
@@ -121,12 +121,12 @@ Z-Push writes files to your file system like logs or data from the
 FileStateMachine (which is default). In order to make this possible,
 you either need to disable the php-safe-mode in php.ini or .htaccess with
     php_admin_flag safe_mode off
-or configure it accordingly, so Z-Push is allowed to write to the 
+or configure it accordingly, so Z-Push is allowed to write to the
 log and state directories. 
 
 After doing this, you should be able to synchronize with your mobile device.
 
-To use the command line tools, access the installation directory 
+To use the command line tools, access the installation directory
 (usually /usr/share/z-push) and execute:
     ./z-push-top.php        and/or
     ./z-push-admin.php
@@ -135,15 +135,15 @@ To facilitate the access symbolic links can be created, by executing:
     ln -s /usr/share/z-push/z-push-admin.php /usr/sbin/z-push-admin
     ln -s /usr/share/z-push/z-push-top.php /usr/sbin/z-push-top
 
-With these symlinks in place the cli tools can be accessed from any 
+With these symlinks in place the cli tools can be accessed from any
 directory and without the php file extension.
 
 
 Upgrade
 -------
 Upgrading to a newer Z-Push version follows the same path as the
 initial installation.
-When upgrading to a new minor version e.g. from Z-Push 1.4 t
+When upgrading to a new minor version e.g. from Z-Push 1.4 to
 Z-Push 1.4.1, the existing Z-Push directory can be overwritten
 when extracting the archive. When installing a new major version
 it is recommended to extract the tarball to another directory and
@@ -170,10 +170,16 @@ and re-create profiles on every device.
 
 *Important*
 States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state migration
-script is available in the tools folder.
+script called migrate-2.0.x-2.1.0.php is available in the tools folder.
+
+*Important*
+When running Z-Push seperately from your Zarafa installation you had in
+the past to configure MAPI_SERVER directly in the config.php of Z-Push.
+This setting has now moved to the config.php file of the Zarafa backend
+(backend/zarafa/config.php).
 
 Please also observe the published release notes of the new Z-Push version.
-For some releases it is necessary to e.g. resynchronize the mobile. 
+For some releases it is necessary to e.g. resynchronize the mobile.
 
 
 S/MIME
@@ -199,7 +205,7 @@ Symantec or Comodo or community-driven e.g. CAcert.org.
 Both most popular directory services Microsoft Active Directory (MS AD)
 and free open source solution OpenLDAP allow to save certificates. Private
 keys/certificates reside in user’s directory or on a smartcard. Public
-certificates are saved in directory. MS AD and OpenLDAP both use 
+certificates are saved in directory. MS AD and OpenLDAP both use
 serCertificate attribute to save it.
 
 In Active Directory the public key for contacts from GAB is saved in
@@ -219,7 +225,7 @@ Other user plugin options like db or unix might not work correctly and
 are not supported.
 
 For in-depth information please refer to:
-http://www.zarafa.com/blog/post/2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices 
+http://www.zarafa.com/blog/post/2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices
 
 Setting up your mobile device
 -----------------------------
@@ -279,4 +285,4 @@ it works fine with the WebApp/Webaccess. The solution is to add:
 
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
-to the config.php file. 
+to the config.php file.

README.md

@@ -1,6 +1,8 @@
 Z-Push-contrib
 ==============
 
+[![Join the chat at https://gitter.im/fmbiete/Z-Push-contrib](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fmbiete/Z-Push-contrib?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 This is a Z-Push fork with changes that I will try to put into the contrib branch, so they can get into the official Z-Push
 
 IMPORTANT:
@@ -31,53 +33,54 @@ You can find some configuration guidelines in the Wiki https://github.com/fmbiet
 
 Requisites
 ==========
-PHP 5.5 (5.3 should also work, 5.4 it's fine, but 5.5 is better)
-NGINX or APACHE
-PHP-FPM or MOD_PHP
+- PHP 5.5 (5.3 should also work, 5.4 it's fine, but 5.5 is better)
+- NGINX or APACHE
+- PHP-FPM or MOD_PHP
 
 Configuration
 =============
 
 NGINX, 1.4 at least or you will need to enable chunkin mode (Use google for Apache configuration)
 
-server {
-    listen 443;
-    server_name zpush.domain.com;
+    server {
+        listen 443;
+        server_name zpush.domain.com;
 
-    ssl on;
-    ssl_certificate         /etc/ssl/certs/zpush.pem;
-    ssl_certificate_key     /etc/ssl/private/zpush.key;
+        ssl on;
+        ssl_certificate         /etc/ssl/certs/zpush.pem;
+        ssl_certificate_key     /etc/ssl/private/zpush.key;
 
-    root    /usr/share/www/z-push-contrib;
-    index   index.php;
+        root    /usr/share/www/z-push-contrib;
+        index   index.php;
 
-    error_log /var/log/nginx/zpush-error.log;
-    access_log /var/log/nginx/zpush-access.log;
+        error_log /var/log/nginx/zpush-error.log;
+        access_log /var/log/nginx/zpush-access.log;
 
-    location / {
+        location / {
             try_files $uri $uri/ index.php;
-    }
+        }
 
-    location /Microsoft-Server-ActiveSync {
+        location /Microsoft-Server-ActiveSync {
             rewrite ^(.*)$  /index.php last;
-    }
+        }
 
-    location ~ .php$ {
+        location ~ .php$ {
             include /etc/nginx/fastcgi_params;
             fastcgi_index index.php;
             fastcgi_param HTTPS on;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_pass unix:/var/run/php5-fpm.sock;
             # Z-Push Ping command will be alive for 470s, but be safe
             fastcgi_read_timeout 630;
+        }
     }
-}
 
 PHP-FPM
-max_execution_time=600
-short_open_tag=On
 
-And configure enough php-fpm processes, you will need 1.5 x number users
+    max_execution_time=600
+    short_open_tag=On
+
+And configure enough php-fpm processes, as a rough estimation you will need 1.5 x number users.
 
 
 Backends