Have a dedicate container for z-push (#19)

* remove z-push from webapp image

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* remove z-push from webapp start script

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* add container for z-push

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* adapt version.sh for z-push

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* ci: committing changes for zpush

* tune version.sh for z-push
adapt makefile

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* add z-push to setup script and docker-compose

Signed-off-by: Felix Bartels <felix@host-consultants.de>

zpush/Dockerfile

@@ -0,0 +1,72 @@
+ARG docker_repo=zokradonh
+FROM ${docker_repo}/kopano_base
+
+ARG ADDITIONAL_KOPANO_PACKAGES=""
+ARG DOWNLOAD_COMMUNITY_PACKAGES=1
+ARG KOPANO_CORE_REPOSITORY_URL="file:/kopano/repo/core"
+ARG KOPANO_ZPUSH_REPOSITORY_URL="http://repo.z-hub.io/z-push:/final/Debian_9.0/"
+ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
+ARG KOPANO_CORE_VERSION=newest
+ARG KOPANO_ZPUSH_VERSION=newest
+ARG RELEASE_KEY_DOWNLOAD=0
+
+# install Kopano WebApp and refresh ca-certificates
+RUN \
+    # community download and package as apt source repository
+    . /kopano/helper/create-kopano-repo.sh && \
+    if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
+        dl_and_package_community "core"; \
+    fi; \
+    echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
+    # save kopano version
+    echo "core-${KOPANO_CORE_VERSION}" > /kopano/buildversion; \
+    echo "zpush-${KOPANO_ZPUSH_VERSION}" >> /kopano/buildversion; \
+    # prepare z-push installation
+    echo "deb ${KOPANO_ZPUSH_REPOSITORY_URL} /" > /etc/apt/sources.list.d/zpush.list && \
+    curl -s -S -o - "${KOPANO_ZPUSH_REPOSITORY_URL}/Release.key" | apt-key add - && \
+    # install
+    set -x && \
+    apt-get update && apt-get install -y --no-install-recommends \
+        apache2 \
+        libapache2-mod-php7.0 \
+        crudini \
+        z-push-kopano \
+        z-push-config-apache \
+        ca-certificates \
+        ${ADDITIONAL_KOPANO_PACKAGES} \
+    && rm -rf /var/cache/apt /var/lib/apt/lists
+
+COPY apache2-kopano.conf /etc/apache2/sites-available/kopano.conf
+
+# configure basics
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8 && \
+    # configure apache
+    rm /etc/apache2/sites-enabled/* && \
+    sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf && \
+    sed -e "s,MaxSpareServers[^:].*,MaxSpareServers 5," -i /etc/apache2/mods-available/mpm_prefork.conf && \
+    a2disconf other-vhosts-access-log && \
+    a2ensite kopano && \
+    echo "Listen 80" > /etc/apache2/ports.conf && \
+    # configure mod_php
+    a2enmod rewrite && \
+    crudini --set /etc/php/7.0/apache2/php.ini PHP upload_max_filesize 500M && \
+    crudini --set /etc/php/7.0/apache2/php.ini PHP post_max_size 500M && \
+    crudini --set /etc/php/7.0/apache2/php.ini PHP max_input_vars 1800 && \
+    crudini --set /etc/php/7.0/apache2/php.ini Session session.save_path /run/sessions && \
+    # configure z-push
+    mkdir -p /var/lib/z-push /var/log/z-push && \
+    chown www-data:www-data /var/lib/z-push /var/log/z-push
+
+VOLUME /var/lib/z-push/
+
+EXPOSE 80/tcp
+
+COPY start.sh /kopano/start.sh
+
+ENV LANG en_US.UTF-8
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD [ "/kopano/start.sh" ]

zpush/apache2-kopano.conf

@@ -0,0 +1,8 @@
+<VirtualHost *:80>
+    DocumentRoot /var/www/
+
+    LogFormat "%{X-Forwarded-For}i %{%a %b %d %T %Y}t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+    ErrorLog "|/bin/cat"
+    CustomLog "|/bin/cat" proxy
+
+</VirtualHost>

zpush/start.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# define default value for serverhostname and serverport if not passed into container
+KCCONF_SERVERHOSTNAME=${KCCONF_SERVERHOSTNAME:-127.0.0.1}
+KCCONF_SERVERPORT=${KCCONF_SERVERPORT:-236}
+ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
+
+set -eu # unset variables are errors & non-zero return values exit the whole script
+
+[ ! -z "$ADDITIONAL_KOPANO_PACKAGES" ] && apt update
+[ ! -z "$ADDITIONAL_KOPANO_PACKAGES" ] && for installpkg in "$ADDITIONAL_KOPANO_PACKAGES"; do
+	if [ $(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+		apt --assume-yes install $installpkg;
+	fi
+done
+
+echo "Ensure directories"
+mkdir -p /run/sessions
+
+if [ "$KCCONF_SERVERHOSTNAME" == "127.0.0.1" ]; then
+	echo "Z-Push is using the default: connection"
+else
+	echo "Z-Push is using an ip connection"
+	sed -e "s#define([\"']MAPI_SERVER[\"'],\s*[\"']default:[\"'])#define('MAPI_SERVER', 'https://${KCCONF_SERVERHOSTNAME}:${KCCONF_SERVERPORT}/kopano')#" \
+	    -i /etc/z-push/kopano.conf.php
+fi
+
+echo "Configuring Z-Push for use behind a reverse proxy"
+sed -e "s#define([\"']USE_CUSTOM_REMOTE_IP_HEADER[\"'],\s*false)#define('USE_CUSTOM_REMOTE_IP_HEADER', true)#" \
+    -i /etc/z-push/z-push.conf.php
+
+echo "Ensure config ownership"
+chown -R www-data:www-data /run/sessions
+
+echo "Activate z-push log rerouting"
+touch /var/log/z-push/z-push.log
+touch /var/log/z-push/z-push-error.log
+chown www-data:www-data /var/log/z-push/z-push.log /var/log/z-push/z-push-error.log
+tail --pid=$$ -F --lines=0 -q /var/log/z-push/z-push.log &
+tail --pid=$$ -F --lines=0 -q /var/log/z-push/z-push-error.log &
+
+echo "Starting Apache"
+rm -f /run/apache2/apache2.pid
+set +u
+source /etc/apache2/envvars
+exec /usr/sbin/apache2 -DFOREGROUND