main/zoneminder: update config in db

4 files changed, 23 insertions, 32 deletions

diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD
index 0f4df5a7f8..876de7d9a1 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=4
+pkgrel=5
 pkgdesc="Video camera surveillance system"
 url="http://www.zoneminder.com/"
 arch="x86_64"
@@ -18,7 +18,7 @@ subpackages=$pkgname-doc
 source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/archive/v${pkgver}.tar.gz
 	$pkgname.initd
 	musl-fix.patch
-	zm-additional.conf"
+	zm-additional.sql"
 
 _builddir=$srcdir/ZoneMinder-$pkgver
 prepare() {
@@ -57,30 +57,31 @@ package() {
 	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.
+	# 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
+	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
+	# update db config with new locations
+	cat "$srcdir"/zm-additional.sql >> \
+		"$pkgdir"/usr/share/zoneminder/db/zm_create.sql
 }
 
 md5sums="9ff149baa1a0d04931fbafcdb3200fab  zoneminder-1.27.0.tar.gz
-0a83db1802b960b03bc45763396093e5  zoneminder.initd
+16162d19b0f8cb1398cca92c0a4df713  zoneminder.initd
 d148970bda67b1e257bb3e1f48404f91  musl-fix.patch
-72404aa3ebda3f6066b6cdb61fae3b85  zm-additional.conf"
+7123480cddd887a26bf6e4e6aada4948  zm-additional.sql"
 sha256sums="2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2  zoneminder-1.27.0.tar.gz
-a98e9a35a367f89c577ea9e8ca1e4ae63a80e396e46bbd3afc70c7e5e266d580  zoneminder.initd
+c6749dca1b6b81686876bc5268e16bb879418cd7a3fb5c4323e8e7f4c9c64399  zoneminder.initd
 d5c1ce946c44e1979cc144f36930827da725919b9d53c1aee0e8749c4ff719d9  musl-fix.patch
-29907ea8b6703e1b37769edc1d9cbe5e0a613e4fad1bee76285963d33b600cdb  zm-additional.conf"
+821f0fc0e42ac48a6c422e8b35f4d03720da8d45fd8dea810fc1d05de38859c8  zm-additional.sql"
 sha512sums="8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14  zoneminder-1.27.0.tar.gz
-f4da24fa424d447a917b0f004745bf1014b92494dc33ef1e78e331d70068897feaa173e1bedeae968203569dbd0b90e80d1e3ca19f96b816b09f3da17b24b4e1  zoneminder.initd
+9fb3b5ca39bf95269553a18f37584c44172df39d1b5023673ea168017c4c5ada16810adebbeb376326dbdc4f2b0868c4b0cae4ba317fb79f77c0d111bc7f8084  zoneminder.initd
 b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f  musl-fix.patch
-eb03c96e66e848523482bd64e5f5450b84adc30afe79635187a4631e353bac81a993a5adb9e6d6b2bda76132e864be878d950a593c8d5a7900b23d0204737c47  zm-additional.conf"
+4b7e0f87bc6e3dfc7cae11c3a75911b3d451729081468249343cd8d283a69e0cb63db42d0f92abd9359848c5218406b02a312cedaaaefb17052889dcf423975e  zm-additional.sql"
diff --git a/main/zoneminder/zm-additional.conf b/main/zoneminder/zm-additional.conf
deleted file mode 100644
index 7352869121..0000000000
--- a/main/zoneminder/zm-additional.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# 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/zm-additional.sql b/main/zoneminder/zm-additional.sql
new file mode 100644
index 0000000000..2c9edd28f2
--- /dev/null
+++ b/main/zoneminder/zm-additional.sql
@@ -0,0 +1,8 @@
+# Update settings to reflect alpine linux default install
+update Config set Value = '/zm/cgi-bin/nph-zms' where Name = 'ZM_PATH_ZMS';
+update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
+update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
+update Config set Value = '/var/log/zoneminder/zm_xml.log' where Name = 'ZM_EYEZM_LOG_FILE';
+update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
+update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
+update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
diff --git a/main/zoneminder/zoneminder.initd b/main/zoneminder/zoneminder.initd
index 5d68e9d65e..9b7d62162a 100644
--- a/main/zoneminder/zoneminder.initd
+++ b/main/zoneminder/zoneminder.initd
@@ -48,7 +48,7 @@ setup() {
 perms() {
 	. /etc/zm.conf
 	ebegin "Setting correct permissions"
-	chown -R $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_DATA $ZM_PATH_WEB \
+	chown -L -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
 }