main/zoneminder: use webapps and move storage to var/lib

3 files changed, 62 insertions, 13 deletions

diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD
index c109f43b34..0f4df5a7f8 100644
--- a/main/zoneminder/APKBUILD
+++ b/main/zoneminder/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=zoneminder
 pkgver=1.27.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Video camera surveillance system"
 url="http://www.zoneminder.com/"
 arch="x86_64"
@@ -17,7 +17,8 @@ install=$pkgname.post-upgrade
 subpackages=$pkgname-doc
 source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/archive/v${pkgver}.tar.gz
 	$pkgname.initd
-	musl-fix.patch"
+	musl-fix.patch
+	zm-additional.conf"
 
 _builddir=$srcdir/ZoneMinder-$pkgver
 prepare() {
@@ -32,32 +33,54 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./bootstrap.sh
-	ZM_LOGDIR=/var/log ZM_RUNDIR=/var/run ZM_TMPDIR=/tmp ./configure \
+	./bootstrap.sh || return 1
+	ZM_LOGDIR=/var/log/zoneminder \
+		ZM_RUNDIR=/var/run \
+		ZM_TMPDIR=/tmp \
+		./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-mmap=yes \
-		--with-webdir=/var/www/localhost/htdocs \
-		--with-cgidir=/var/www/cgi-bin \
+		--enable-crashtrace=no \
+		--enable-debug=no \
+		--with-webdir=/usr/share/webapps/$pkgname/htdocs \
+		--with-cgidir=/usr/share/webapps/$pkgname/cgi-bin \
 		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
+	local dir
 	make install DESTDIR=$pkgdir
 	rmdir "$pkgdir/tmp"
 	find "$pkgdir" -name perllocal.pod -delete
 	echo -n $pkgver > "$pkgdir/usr/share/$pkgname/version"
 	install -D -m 755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
+	#move storage to var/lib where it belongs.
+	for dir in events images; do
+		install -m 755 -d "$pkgdir"/var/lib/zoneminder/$dir
+		rmdir "$pkgdir"/usr/share/webapps/zoneminder/htdocs/$dir
+		ln -sf /var/lib/zoneminder/$dir \
+			"$pkgdir"/usr/share/webapps/zoneminder/htdocs/$dir || return 1
+	done
+	for dir in lib/zoneminder/sock lib/zoneminder/swap spool/zoneminder-upload \
+		log/zoneminder; do
+			install -m 755 -d "$pkgdir"/var/"$dir"
+	done
+	# update config with new locations
+	cat "$srcdir"/zm-additional.conf >> "$pkgdir"/etc/zm.conf
 }
 
 md5sums="9ff149baa1a0d04931fbafcdb3200fab  zoneminder-1.27.0.tar.gz
-a22f2c550cc5c01d11f345113fed2008  zoneminder.initd
-d148970bda67b1e257bb3e1f48404f91  musl-fix.patch"
+0a83db1802b960b03bc45763396093e5  zoneminder.initd
+d148970bda67b1e257bb3e1f48404f91  musl-fix.patch
+72404aa3ebda3f6066b6cdb61fae3b85  zm-additional.conf"
 sha256sums="2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2  zoneminder-1.27.0.tar.gz
-eafd064606cdb56373735cc70cfc841beb5b5d1bf3d9924127d320b281c36449  zoneminder.initd
-d5c1ce946c44e1979cc144f36930827da725919b9d53c1aee0e8749c4ff719d9  musl-fix.patch"
+a98e9a35a367f89c577ea9e8ca1e4ae63a80e396e46bbd3afc70c7e5e266d580  zoneminder.initd
+d5c1ce946c44e1979cc144f36930827da725919b9d53c1aee0e8749c4ff719d9  musl-fix.patch
+29907ea8b6703e1b37769edc1d9cbe5e0a613e4fad1bee76285963d33b600cdb  zm-additional.conf"
 sha512sums="8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14  zoneminder-1.27.0.tar.gz
-07e711032ddbdc12b1a706d6c7ec715f005bf6dd4abc5225e3d539b24f5b79e37bdd277d3a65ed2b485d5de6755d1b1602fce6f879d1eff148a1581a3e1b0e8b  zoneminder.initd
-b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f  musl-fix.patch"
+f4da24fa424d447a917b0f004745bf1014b92494dc33ef1e78e331d70068897feaa173e1bedeae968203569dbd0b90e80d1e3ca19f96b816b09f3da17b24b4e1  zoneminder.initd
+b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f  musl-fix.patch
+eb03c96e66e848523482bd64e5f5450b84adc30afe79635187a4631e353bac81a993a5adb9e6d6b2bda76132e864be878d950a593c8d5a7900b23d0204737c47  zm-additional.conf"
diff --git a/main/zoneminder/zm-additional.conf b/main/zoneminder/zm-additional.conf
new file mode 100644
index 0000000000..7352869121
--- /dev/null
+++ b/main/zoneminder/zm-additional.conf
@@ -0,0 +1,18 @@
+
+# ZoneMinder default log location
+ZM_PATH_LOGS=/var/log/zoneminder
+
+# ZoneMineder debug log location
+ZM_EXTRA_DEBUG_LOG=/var/log/zoneminder/zm_debug_log+
+
+# EyeZM log file location
+ZM_EYEZM_LOG_FILE=/var/log/zoneminder/zm_xml.log
+
+# ZoneMinder socket location
+ZM_PATH_SOCKS=/var/lib/zoneminder/sock
+
+# ZoneMinder swap location
+ZM_PATH_SWAP=/var/lib/zoneminder/swap
+
+# ZoneMinder FTP upload location
+ZM_UPLOAD_FTP_LOC_DIR=/var/spool/zoneminder-upload
diff --git a/main/zoneminder/zoneminder.initd b/main/zoneminder/zoneminder.initd
index f7adfcfd00..5d68e9d65e 100644
--- a/main/zoneminder/zoneminder.initd
+++ b/main/zoneminder/zoneminder.initd
@@ -5,7 +5,7 @@
 
 name=zoneminder
 command=/usr/bin/zmpkg.pl
-extra_commands=setup
+extra_commands="setup perms"
 
 depend() {
 	after mysql
@@ -44,3 +44,11 @@ setup() {
 		< $ZM_PATH_DATA/db/zm_create.sql
 	eend $?
 }
+
+perms() {
+	. /etc/zm.conf
+	ebegin "Setting correct permissions"
+	chown -R $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_DATA $ZM_PATH_WEB \
+		$ZM_PATH_CGI $ZM_PATH_LOGS $ZM_PATH_SOCKS $ZM_PATH_SWAP \
+		$ZM_UPLOAD_FTP_LOC_DIR
+}