Merge pull request #296 in ZP/z-push from...

Merge pull request #296 in ZP/z-push from ~FBARTELS/z-push:bugfix/ZP-982-include-buildfiles-in-git-repository to develop

* commit 'fe1d67ff':
  delete old debian.readme which had been carid on from the original d-push package. move lighttpd and nginx example config to config folder
  ZP-982 include-buildfiles-in-git-repository Released under the Affero GNU General Public License (AGPL) version 3.

build/deb/debian.NEWS.Debian

+z-push (1.0.0-1) unstable; urgency=low
+
+    Upgrading from z-push 2.0 versions
+
+    * Upgrade your z-push files to the new version
+    * Mobiles which connect will receive a temporary synchronization error
+      (only visible if you explicitly click "refresh" on the mobiles)
+    * Run the upgrade script located in the tools folder. The files
+      distributed by us contain a correct configuration of this script to
+      access the config file and locate the state files. If your file
+      locations are different, please check the path settings in the top of
+      the migration script.
+    * After running the migration script, mobiles will continue
+      synchronizing without any re-synchronization
+
+    Upgrading from z-push 1.X versions
+
+    The easiest way to upgrade is to follow the steps for a new installation.
+    The states of z-push 1.X are not compatible and there is no upgrade path,
+    but as this version implements a fully automatic resynchronisation of
+    devices it should not affect the users and work without the user
+    interaction.
+
+    Since all devices will start a full resyncronisation after the upgrade it
+    is recommended to do the upgrade during a period with low traffic.
+
+    This version offers improved logging facilities, so please review your
+    configuration with respect to this.
+
+ -- Michael Kromer <mike@zarafa.com>  Sat, 02 Aug 2014 00:38:49 +0200

build/deb/debian.changelog

+z-push (1.0.0-1) unstable; urgency=low
+
+  * Current release
+
+ -- Zarafa Development <development@zarafa.com>  Tue, 20 Jan 2015 10:25:03 +0100
+

build/deb/debian.compat

+7

build/deb/debian.control

+Source: z-push
+Section: web
+Priority: extra
+Maintainer: Sebastian Kummer <sebastian@z-push.org>
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.4
+Homepage: http://z-push.org
+
+Package: z-push-common
+Architecture: all
+Depends: ${misc:Depends}, php5 (>= 5.4), php5-cli, php-soap
+Conflicts: d-push, z-push
+Replaces: d-push, z-push
+Description: open source implementation of the ActiveSync protocol
+ Z-Push is an implementation of the ActiveSync protocol which is used
+ 'over-the-air' for multi platform ActiveSync devices, including Windows 
+ Phone, Apple iPhone and iPad, Android, Blackberry 10 devices and 
+ MS Outlook 2013 and later. With Z-Push any groupware can be connected 
+ and synchronized with these devices.
+
+Package: z-push-backend-caldav
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-curl, libawl-php
+Description: Z-Push caldav backend
+ Backend for Z-Push, that adds the ability to connect to a caldav server
+
+Package: z-push-backend-carddav
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-curl, php5-xsl
+Description: Z-Push carddav backend
+ Backend for Z-Push, that adds the ability to connect to a carddav server
+
+Package: z-push-backend-combined
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version})
+Description: Z-Push combined backend
+ Backend for Z-Push, that adds the ability to combine backends
+
+Package: z-push-backend-imap
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-imap
+Description: Z-Push imap backend
+ Backend for Z-Push, that adds the ability to connect to a imap server
+
+Package: z-push-backend-ldap
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-ldap
+Description: Z-Push ldap backend
+ Backend for Z-Push, that adds the ability to connect to a ldap server
+
+Package: z-push-backend-kopano
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-mapi
+Description: Z-Push Kopano backend
+ Backend for Z-Push, that adds the ability to connect to a Kopano server
+
+Package: z-push-kopano
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), z-push-backend-kopano (= ${binary:Version}), z-push-ipc-sharedmemory (= ${binary:Version})
+Description: Z-Push for Kopano
+ Z-Push for Kopano meta package
+
+Package: z-push-kopano-gabsync
+Architecture: all
+Depends: ${misc:Depends}, php5-mapi
+Description: GAB sync for Kopano
+ Synchronizes a the global address book for the Kopano Outlook Extension
+
+Package: z-push-ipc-sharedmemory
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version})
+Description: Z-Push ipc shared memory provider
+ Provider for Z-Push, that adds the ability to use ipc shared memory
+
+Package: z-push-ipc-memcached
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-memcached
+Description: Z-Push ipc memcached provider
+ Provider for Z-Push, that adds the ability to use ipc memcached
+
+Package: z-push-backend-galsearch-ldap
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-ldap
+Description: Z-Push searchldap backend
+ Backend for Z-Push, that adds the ability to search a ldap server
+
+Package: z-push-state-sql
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), php5-mysql
+Description: Z-Push mysql state backend
+ Backend for Z-Push, that adds the ability to save states in a mysql database
+
+Package: z-push-autodiscover
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), apache2, z-push-backend-caldav | z-push-backend-carddav | z-push-backend-combined | z-push-backend-imap | z-push-backend-ldap | z-push-backend-kopano
+Description: Z-Push autodiscover
+ Autodiscover for Z-Push backends
+
+Package: z-push-config-apache
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), libapache2-mod-php5
+Description: Z-Push apache configuration
+ Z-push apache configuration files
+
+Package: z-push-config-apache-autodiscover
+Architecture: all
+Depends: ${misc:Depends}, z-push-autodiscover (= ${binary:Version}), libapache2-mod-php5
+Description: Z-Push autodiscover apache configuration
+ Z-push autodiscover apache configuration files
\ No newline at end of file

build/deb/debian.rules

+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+#include /usr/share/quilt/quilt.make
+
+
+
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+
+%:
+	dh  $@
+
+override_dh_install:
+	mv src/* .
+	sed -s "s/ZPUSHVERSION/${DEB_VERSION}/" build/version.php.in > version.php
+
+	mv "config.php" "z-push.conf.php";
+
+	mkdir conftmp
+	mv "backend/caldav/config.php" "conftmp/caldav.conf.php";
+	mv "backend/carddav/config.php" "conftmp/carddav.conf.php";
+	mv "backend/combined/config.php" "conftmp/combined.conf.php";
+	mv "backend/imap/config.php" "conftmp/imap.conf.php";
+	mv "backend/ldap/config.php" "conftmp/ldap.conf.php";
+	mv "backend/kopano/config.php" "conftmp/kopano.conf.php";
+	mv "backend/ipcmemcached/config.php" "conftmp/memcached.conf.php";
+	mv "backend/searchldap/config.php" "conftmp/galsearch-ldap.conf.php";
+	mv "backend/sqlstatemachine/config.php" "conftmp/state-sql.conf.php";
+	mv "tools/gab-sync/config.php" "conftmp/gabsync.conf.php";
+	mv "autodiscover/config.php" "conftmp/autodiscover.conf.php";
+
+	dh_install
+	mkdir -p debian/z-push/var/lib/z-push
+	mkdir -p debian/z-push/var/log/z-push
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	dh_clean
+
+build:

build/deb/debian.z-push-autodiscover.install

+conftmp/autodiscover.conf.php etc/z-push/
+autodiscover            /usr/share/z-push/

build/deb/debian.z-push-autodiscover.links

+etc/z-push/autodiscover.conf.php usr/share/z-push/autodiscover/config.php

build/deb/debian.z-push-backend-caldav.install

+conftmp/caldav.conf.php /etc/z-push/
+backend/caldav            /usr/share/z-push/backend

build/deb/debian.z-push-backend-caldav.links

+etc/z-push/caldav.conf.php usr/share/z-push/backend/caldav/config.php

build/deb/debian.z-push-backend-carddav.install

+conftmp/carddav.conf.php /etc/z-push/
+backend/carddav            /usr/share/z-push/backend/

build/deb/debian.z-push-backend-carddav.links

+etc/z-push/carddav.conf.php usr/share/z-push/backend/carddav/config.php

build/deb/debian.z-push-backend-combined.install

+conftmp/combined.conf.php /etc/z-push/
+backend/combined            /usr/share/z-push/backend/

build/deb/debian.z-push-backend-combined.links

+etc/z-push/combined.conf.php usr/share/z-push/backend/combined/config.php

build/deb/debian.z-push-backend-galsearch-ldap.install

+conftmp/galsearch-ldap.conf.php /etc/z-push/
+backend/searchldap            /usr/share/z-push/backend

build/deb/debian.z-push-backend-galsearch-ldap.links

+etc/z-push/galsearch-ldap.conf.php usr/share/z-push/backend/searchldap/config.php

build/deb/debian.z-push-backend-imap.install

+conftmp/imap.conf.php /etc/z-push/
+backend/imap           /usr/share/z-push/backend/

build/deb/debian.z-push-backend-imap.links

+etc/z-push/imap.conf.php usr/share/z-push/backend/imap/config.php

build/deb/debian.z-push-backend-kopano.install

+conftmp/kopano.conf.php /etc/z-push/
+backend/kopano            /usr/share/z-push/backend/

build/deb/debian.z-push-backend-kopano.links

+etc/z-push/kopano.conf.php usr/share/z-push/backend/kopano/config.php

build/deb/debian.z-push-backend-ldap.install

+conftmp/ldap.conf.php /etc/z-push/
+backend/ldap            /usr/share/z-push/backend/

build/deb/debian.z-push-backend-ldap.links

+etc/z-push/ldap.conf.php usr/share/z-push/backend/ldap/config.php

build/deb/debian.z-push-common.dirs

+usr/share/z-push/backend
+var/lib/z-push
+var/log/z-push
+

build/deb/debian.z-push-common.install

+z-push.conf.php    /etc/z-push/
+policies.ini       /etc/z-push/
+include            /usr/share/z-push/
+index.php          /usr/share/z-push/
+lib                /usr/share/z-push/
+vendor             /usr/share/z-push/
+version.php        /usr/share/z-push/
+z-push-admin.php   /usr/share/z-push/
+z-push-top.php     /usr/share/z-push/
+
+config/z-push.lr   etc/logrotate.d/

build/deb/debian.z-push-common.links

+etc/z-push/z-push.conf.php usr/share/z-push/config.php
+etc/z-push/policies.ini usr/share/z-push/policies.ini
+usr/share/z-push/z-push-admin.php /usr/local/sbin/z-push-admin
+usr/share/z-push/z-push-top.php /usr/local/sbin/z-push-top

build/deb/debian.z-push-common.postinst

+#!/bin/sh
+# postinst script for z-push
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+    configure)
+    if [ "$1" = "configure" -a -n "$2" ] && dpkg --compare-versions "$2" le 2.3.0 ; then
+        /usr/local/sbin/z-push-admin -a fixstates
+    fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

build/deb/debian.z-push-config-apache-autodiscover.install

+config/apache2/z-push-autodiscover.conf /etc/apache2/conf-available/

build/deb/debian.z-push-config-apache-autodiscover.postinst

+#!/bin/sh
+# postinst script for z-push-config-apache-autodiscover
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if type a2enconf >/dev/null 2>/dev/null; then
+  # FIXME: configure case below pulls symlinks from conf-available manually.
+  a2enconf z-push-autodiscover || true
+  service apache2 reload || true
+fi
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d apache2 $1 3>/dev/null || true
+    else
+            /etc/init.d/apache2 $1 3>/dev/null || true
+    fi
+    else
+        echo "Your Apache 2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+case "$1" in
+    configure)
+    CONF="z-push-autodiscover"
+    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+        . /usr/share/apache2/apache2-maintscript-helper
+        apache2_invoke enmod alias
+        if [ -e /etc/apache2/conf-available/$CONF.conf ] ; then
+            apache2_invoke enconf $CONF || exit $?
+        fi
+    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+        if [ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/$CONF.conf ] ; then
+            ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf
+        fi
+        # Test whether a2enmod is available (and thus also apache2ctl).
+        if [ -x /usr/sbin/a2enmod ]; then
+            # Enable the Apache2 rewrite module if not already enabled
+            a2enmod alias > /dev/null || true
+            # Restart Apache to really enable the module and load
+            # /etc/apache2/conf.d/z-push-autodiscover.conf.
+            reload_apache reload
+        fi
+    fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

build/deb/debian.z-push-config-apache-autodiscover.postrm

+#!/bin/sh
+# postrm script for z-push-config-apache
+
+set -e
+
+if type a2disconf >/dev/null 2>/dev/null; then
+  a2disconf z-push-autodiscover || true
+  service apache2 reload || true
+fi
+
+#DEBHELPER#
+
+exit 0

build/deb/debian.z-push-config-apache.install

+config/apache2/z-push.conf /etc/apache2/conf-available/

build/deb/debian.z-push-config-apache.postinst

+#!/bin/sh
+# postinst script for z-push-config-apache
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if type a2enconf >/dev/null 2>/dev/null; then
+  # FIXME: configure case below pulls symlinks from conf-available manually.
+  a2enconf z-push || true
+  service apache2 reload || true
+fi
+
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d apache2 $1 3>/dev/null || true
+    else
+            /etc/init.d/apache2 $1 3>/dev/null || true
+    fi
+    else
+        echo "Your Apache 2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+set_perms() {
+        USER=$1
+        GROUP=$2
+        MODE=$3
+        FILE=$4
+        if ! dpkg-statoverride --list $FILE > /dev/null 2>&1; then
+                chown -R $USER:$GROUP $FILE
+                chmod -R $MODE $FILE
+        fi
+}
+
+
+case "$1" in
+    configure)
+
+    #Set permissions
+    set_perms www-data www-data 700 /var/lib/z-push
+    set_perms www-data www-data 700 /var/log/z-push
+
+    CONF="z-push"
+    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+        . /usr/share/apache2/apache2-maintscript-helper
+        if [ -e /etc/apache2/conf-available/$CONF.conf ] ; then
+            apache2_invoke enconf $CONF || exit $?
+        fi
+    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+        if [ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/$CONF.conf ] ; then
+            ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf
+        fi
+        # Test whether a2enmod is available (and thus also apache2ctl).
+        if [ -x /usr/sbin/a2enmod ]; then
+            # Restart Apache to really enable the module and load
+            # /etc/apache2/conf.d/z-push.conf.
+            reload_apache reload
+        fi
+    fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

build/deb/debian.z-push-config-apache.postrm

+#!/bin/sh
+# postrm script for z-push-config-apache
+
+set -e
+
+if type a2disconf >/dev/null 2>/dev/null; then
+  a2disconf z-push || true
+  service apache2 reload || true
+fi
+
+#DEBHELPER#
+
+exit 0

build/deb/debian.z-push-ipc-memcached.install

+conftmp/memcached.conf.php /etc/z-push/
+backend/ipcmemcached            /usr/share/z-push/backend/

build/deb/debian.z-push-ipc-memcached.links

+etc/z-push/memcached.conf.php usr/share/z-push/backend/ipcmemcached/config.php

build/deb/debian.z-push-ipc-sharedmemory.install

+backend/ipcsharedmemory            /usr/share/z-push/backend/

build/deb/debian.z-push-kopano-gabsync.install

+conftmp/gabsync.conf.php /etc/z-push/
+tools/gab-sync            /usr/share/z-push/tools/

build/deb/debian.z-push-kopano-gabsync.links

+etc/z-push/gabsync.conf.php usr/share/z-push/tools/gab-sync/config.php
+usr/share/z-push/tools/gab-sync/gab-sync.php /usr/local/sbin/z-push-gabsync

build/deb/debian.z-push-state-sql.install

+conftmp/state-sql.conf.php /etc/z-push/
+backend/sqlstatemachine            /usr/share/z-push/backend/
+tools/migrate-filestates-to-db.php        /usr/share/z-push/tools/

build/deb/debian.z-push-state-sql.links

+etc/z-push/state-sql.conf.php usr/share/z-push/backend/sqlstatemachine/config.php

build/deb/z-push.dsc

+Format: 1.0
+Source: z-push
+Binary: z-push
+Architecture: all
+Version: 1.0.0-1
+Maintainer: Sebastian Kummer <sebastian@z-push.org>
+Homepage: http://z-push.org
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 8.0.0)
+Files: 

build/version.php.in

+<?php
+/***********************************************
+* File      :   version.php
+* Project   :   Z-Push
+* Descr     :   version number
+*
+* Created   :   18.04.2008
+*
+* Copyright 2007 - 2013, 2015 Zarafa Deutschland GmbH
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License, version 3,
+* as published by the Free Software Foundation with the following additional
+* term according to sec. 7:
+*
+* According to sec. 7 of the GNU Affero General Public License, version 3,
+* the terms of the AGPL are supplemented with the following terms:
+*
+* "Zarafa" is a registered trademark of Zarafa B.V.
+* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
+* The licensing of the Program under the AGPL does not imply a trademark license.
+* Therefore any rights, title and interest in our trademarks remain entirely with us.
+*
+* However, if you propagate an unmodified version of the Program you are
+* allowed to use the term "Z-Push" to indicate that you distribute the Program.
+* Furthermore you may use our trademarks where it is necessary to indicate
+* the intended purpose of a product or service provided you use it in accordance
+* with honest practices in industrial or commercial matters.
+* If you want to propagate modified versions of the Program under the name "Z-Push",
+* you may only do so if you have a written permission by Zarafa Deutschland GmbH
+* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Consult LICENSE file for details
+************************************************/
+
+define("ZPUSH_VERSION", "ZPUSHVERSION");
\ No newline at end of file

config/lighttpd/z-push.conf

+# Alias for z-push directory
+alias.url += (
+    "/Microsoft-Server-ActiveSync" => "/usr/share/z-push/index.php"
+)

config/nginx/z-push.conf

+server {
+    listen 443;
+    server_name localhost; # Please edit me
+ 
+    ssl on;
+    #ssl_certificate         /path/to/ssl.crt; # Please edit me
+    #ssl_certificate_key     /path/to/ssl.key; # Please edit me
+ 
+    root    /usr/share/webapps/z-push;
+    index   index.php;
+ 
+    # Performance Settings
+    #client_max_body_size 4M;
+    #client_body_buffer_size 128k;
+ 
+    location / {
+            try_files $uri $uri/ index.php;
+    }
+ 
+    location /Microsoft-Server-ActiveSync {
+            rewrite ^(.*)$  /index.php last;
+    }
+ 
+    location ~ .php$ {
+            include fastcgi_params;
+            fastcgi_index index.php;
+            fastcgi_param HTTPS on;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ 
+            fastcgi_pass unix:/run/php-fpm/php-fpm.sock;
+    }
+}

config/z-push.lr

+/var/log/z-push/*.log {
+	size 1k
+	create www-data www-data
+	compress
+	rotate 4
+}