Update to relaese 66 of zimbrabackend

Author: Serge Ohl

Dockerfile

@@ -3,6 +3,7 @@ MAINTAINER Serge Ohl <[email protected]>
 
 ENV VERSION 2.3
 ENV VERSIONFULL 2.3.6
+ENV BACKENDVERSION 66
 ENV TERM xterm
 
 ENV ZPUSH_URL zpush_default
@@ -12,12 +13,17 @@ RUN apt-get update && apt-get install -y wget
 
 # Install zpush
 RUN cd /var/www/html && \
-	wget -O - "http://download.z-push.org/final/${VERSION}/z-push-${VERSIONFULL}.tar.gz" | tar --strip-components=1 -x -z && ls -lah
+	wget -O - "http://download.z-push.org/final/${VERSION}/z-push-${VERSIONFULL}.tar.gz" | tar --strip-components=1 -x -z 
 
 # Add zimbra backend
-RUN cd /tmp && \
-	wget -O - "http://downloads.sourceforge.net/project/zimbrabackend/Release62/zimbra62.tgz?use_mirror=freefr" | tar --strip-components=1 -x -z && \
-	mv /tmp/z-push-2 /var/www/html/backend/zimbra
+RUN cd /var/www/html/backend  && \
+	curl -o zpzb-install.sh -L "https://sourceforge.net/projects/zimbrabackend/files/Release${BACKENDVERSION}/zpzb-install.sh/download"  && \
+	curl -o zimbra${BACKENDVERSION}.tgz  -L "http://downloads.sourceforge.net/project/zimbrabackend/Release${BACKENDVERSION}/zimbra${BACKENDVERSION}.tgz" 
+	
+RUN cd /var/www/html/backend &&\
+	chmod +x zpzb-install.sh &&\
+	sed -i "/chcon[^']*$/d" zpzb-install.sh &&\
+	/bin/bash ./zpzb-install.sh $BACKENDVERSION ; exit 0
 
 # Create directory for zpush
 RUN mkdir -p /var/log/z-push && mkdir /var/lib/z-push

README.md

@@ -1 +1,30 @@
-# docker-zpush-zimbra
+# ActiveSync for Zimbra with Z-push
+
+## Get started
+
+It's very simple, first, get it :
+
+```bash
+docker pull darkjeff/zpush-zimbra
+```
+
+And run it :
+
+```bash
+docker run -d \
+	-p 80:80 \
+	-e ZIMBRA_HOST=yourzimbraurl.tld \
+	-e ZPUSH_URL=yourpublicurlforsyn.tld \
+	--name zpush
+	docker pull darkjeff/zpush-zimbra
+```
+
+## Configuration
+
+You can tune the configuration with environment variable:
+
+*ZPUSH_URL*: The url (whitout https://) of your zimbra. The container have to reach this address.
+*ZPUSH_URL_IN_HTTP*: If your zimbra is not listenning in https set `true`.*Deflaut*: https
+*ZIMBRA_URL*: The public url of your sync service (whitout https://)
+*ZIMBRA_URL_IN_HTTP*: If your zimbra is not listenning in https set `true`. *Deflaut*: https
+*TIMEZONE*: [PHP timezone] (http://php.net/manual/en/timezones.php). *Deflaut*: 'Europe/London'

default-vhost.conf

@@ -3,7 +3,6 @@
 	ServerAdmin webmaster@localhost
 
 	Alias /Microsoft-Server-ActiveSync /var/www/html/index.php
-	AliasMatch (?i)/Autodiscover/Autodiscover.xml "/var/www/html/autodiscover/autodiscover.php"
 
 	DocumentRoot /var/www/html
 	<Directory /var/www/html/>

entrypoint.sh

@@ -16,11 +16,12 @@ if [ ! -f  "${ZPUSH_CONFIG}.bkp" ]; then
     define('ZIMBRA_SYNC_CONTACT_PICTURES', true);
     define('ZIMBRA_VIRTUAL_CONTACTS',true);
     define('ZIMBRA_VIRTUAL_APPOINTMENTS',true);
+    define('ZIMBRA_VIRTUAL_NOTES',true);
     define('ZIMBRA_VIRTUAL_TASKS',true);
     define('ZIMBRA_IGNORE_EMAILED_CONTACTS',true);
     define('ZIMBRA_HTML',true);
     define('ZIMBRA_ENFORCE_VALID_EMAIL',false);
-    define('ZIMBRA_SMART_FOLDERS',true);
+    define('ZIMBRA_SMART_FOLDERS',false);
 EOF
 fi