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

Merge pull request #482 in ZP/z-push from bugfix/ZP-1153-packaging-run-tools-als-webserver to develop

* commit '95a80df5':
  ZP-1153 Install wrappers for z-push-admin.php and z-push-top.php

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

@@ -9,3 +9,6 @@ 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/z-push-admin	/usr/sbin/
+build/deb/z-push-top	/usr/sbin/

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/sbin/z-push-admin
-usr/share/z-push/z-push-top.php /usr/sbin/z-push-top

build/deb/z-push-admin

+#!/bin/sh
+# Wrapper script for z-push-admin.
+user=$(id -nu)
+if [ "$user" = "root" ]; then
+	su -l www-data -s /bin/sh -c "/usr/share/z-push/z-push-admin.php $*"
+elif [ "$user" = "www-data" ]; then
+	/usr/share/z-push/z-push-admin.php "$@"
+else
+	exit 1
+fi

build/deb/z-push-top

+#!/bin/sh
+# Wrapper script for z-push-top.
+user=$(id -nu)
+if [ "$user" = "root" ]; then
+	su -l www-data -s /bin/sh -c "/usr/share/z-push/z-push-top.php $*"
+elif [ "$user" = "www-data" ]; then
+	/usr/share/z-push/z-push-top.php "$@"
+else
+	exit 1
+fi