prepare changes to run kdav through kweb as well (#424)

* prepare changes to run kdav through kweb as well
* add kdav configuration
* add remaining kdav configuration for kweb
* import remaining kweb/php-fpm config from https://stash.kopano.io/projects/PKG/repos/kopano-one-php-fpm/browse

zpush/Dockerfile

@@ -47,7 +47,6 @@ RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
     # TODO remove php-mbstring once https://jira.z-hub.io/browse/ZP-1541 is resolved
     # TODO remove php-xml once https://jira.z-hub.io/projects/ZP/issues/ZP-1558 is resolved
     apt-get update && apt-get install -y --no-install-recommends \
-        crudini \
         php-mbstring \
         php-xml \
         z-push-autodiscover \
@@ -76,6 +75,7 @@ RUN \
     mkdir -p /var/lib/z-push /var/log/z-push && \
     chown www-data:www-data /var/lib/z-push /var/log/z-push
 
+COPY kopano-z-push.conf /etc/php/7.3/fpm/pool.d/
 COPY kweb.cfg /etc/kweb.cfg
 COPY start.sh /kopano/start.sh
 

zpush/kopano-z-push.conf

@@ -0,0 +1,47 @@
+[kopano-z-push]
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = www-data
+group = www-data
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions.
+; Default Values: user and group are set as the running user
+;                 mode is set to 0660
+listen.owner = www-data
+listen.group = www-data
+
+listen = /run/php/php-fpm-kopano-z-push.sock
+
+; Pool configuration intended for up to 500 users.
+pm = dynamic
+pm.max_children = 200
+pm.start_servers = 10
+pm.min_spare_servers = 10
+pm.max_spare_servers = 200
+pm.process_idle_timeout = 3540s
+pm.max_requests = 200
+pm.status_path = /status
+
+ping.path = /ping
+ping.response = pong
+
+security.limit_extensions = .php
+
+php_flag[display_errors] = off
+
+php_admin_value[max_execution_time] = 3540
+php_admin_value[post_max_size] = 20M
+php_admin_value[upload_max_filesize] = 20M
+php_admin_value[memory_limit] = 25M
+
+php_admin_flag[log_errors] = on
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+catch_workers_output = no

zpush/kweb.cfg

@@ -5,23 +5,40 @@
 	# healthcheck
 	status 200 /status
 
-	rewrite /Microsoft-Server-ActiveSync /Microsoft-Server-ActiveSync/index.php
+	rewrite /Microsoft-Server-ActiveSync {
+		regexp ^$
+		to /z-push/index.php
+	}
 
-	fastcgi2 /Microsoft-Server-ActiveSync /run/php/php7.3-fpm.sock php {
-		without /Microsoft-Server-ActiveSync/
-		root /usr/share/z-push/
+	fastcgi2 /z-push/ /run/php/php-fpm-kopano-z-push.sock php {
+		without /z-push/
+		root /usr/share/z-push
 		read_timeout 3605s
 	}
 
-	# Case insensitive path rewrite.
-	rewrite / {
-		regexp (?i)^/Autodiscover/Autodiscover.xml
-		to /Autodiscover/autodiscover.php
+	status 403 {
+		/z-push/autodiscover
+		/z-push/backend
+		/z-push/config.php
+		/z-push/include
+		/z-push/lib
+		/z-push/vendor
+		/z-push/version.php
+		/z-push/z-push-admin.php
+		/z-push/z-push-top.php
 	}
 
-	fastcgi2 /Autodiscover/ /run/php/php7.3-fpm.sock php {
-		without /Autodiscover/
+	rewrite / {
+		regexp (?i)^/Autodiscover/Autodiscover.xml
+		to /z-push-autodiscover/autodiscover.php
+	}
+
+	fastcgi2 /z-push-autodiscover/ /run/php/php-fpm-kopano-z-push.sock php {
+		without /z-push-autodiscover/
 		root /usr/share/z-push/autodiscover
 	}
 
+	status 403 {
+		/z-push-autodiscover/config.php
+	}
 }