aboutsummaryrefslogtreecommitdiffstats
path: root/main/zoneminder
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2016-02-15 22:36:40 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2016-02-15 22:36:40 +0200
commit0cdf1253acd759b10d0c59f0ebd6462f706a452a (patch)
tree391332ddf881ab4c1e466f3822114973679b7900 /main/zoneminder
parent701b5621b44e9b37c4d84042588a33a314cf26e9 (diff)
downloadaports-0cdf1253acd759b10d0c59f0ebd6462f706a452a.tar.bz2
aports-0cdf1253acd759b10d0c59f0ebd6462f706a452a.tar.xz
main/zoneminder: do not set paths using SQL
Set all paths via configure. Substituting absolute paths for relative paths breaks certain URLs as they are passed directly to HTML pages.
Diffstat (limited to 'main/zoneminder')
-rw-r--r--main/zoneminder/APKBUILD9
-rw-r--r--main/zoneminder/zm-additional.sql10
2 files changed, 5 insertions, 14 deletions
diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD
index 4f0ad3d682..f6ad2cf66f 100644
--- a/main/zoneminder/APKBUILD
+++ b/main/zoneminder/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=zoneminder
pkgver=1.29.0
-pkgrel=1
+pkgrel=2
pkgdesc="Video camera surveillance system"
url="http://www.zoneminder.com/"
arch="x86_64"
@@ -40,6 +40,7 @@ build() {
./bootstrap.sh || return 1
ZM_LOGDIR=/var/log/zoneminder \
ZM_RUNDIR=/var/run/zoneminder \
+ ZM_SOCKDIR=/var/run/zoneminder \
ZM_TMPDIR=/var/lib/zoneminder/temp \
./configure \
--prefix=/usr \
@@ -86,12 +87,12 @@ package() {
md5sums="b4de8dd3fd86fc72e929e116e926d901 zoneminder-1.29.0.tar.gz
30934b0cb9d4ed19b982f75ac865d5ac zoneminder.initd
b95482fefbf22e8a89fb061805d05f03 musl-fix.patch
-775f1e13017e7cd1ad11bfe4383c2c2d zm-additional.sql"
+24359849eef7c5293f63136e704fdca4 zm-additional.sql"
sha256sums="34e1f0d4b616e320e557f8e3fbe278d3ab70f30f6278cc153b44f2193c85ddbd zoneminder-1.29.0.tar.gz
5e3b1ae959f7a0f005c0357adfbcd0c764a4047d9bfd202119b4f5809846427e zoneminder.initd
829551a83e62ff84fcba7a0f88105a0b6d15d89a66e1e98dc50098c30c48672f musl-fix.patch
-0b514a0506425e4dbde7030e7feabadb8b1d723946e0409ea0cd5f45833fee1b zm-additional.sql"
+dea3a1b493bc7d7dbe9c431f565b9e916fb8a8bd29fcd74947b14592ef7f4494 zm-additional.sql"
sha512sums="71a397df83c92de3b977832bb0a11791a3a756e7219e0cf3dc6c5c30fa0dd488ea00a925433669bf4e79873df980a852f2c805d1b7c9c8a06b6c39b9a16a2fda zoneminder-1.29.0.tar.gz
6cc8fd5aa30665b5b816216f8ff3cca1ea028f7959ee659eb8d9264b2f3cdcabd06e9a7d62a97b366c10e79779332d2cc386e291860d9b73b1619365d47eb918 zoneminder.initd
b2c4e31fd0a31f034be3029eab4f2943e07e95e64bb2d8eb38d93b790059d694a9a007e98b0f9b4c47ecfe91296bc21a3795b8a4aaf5b2a83071251456e533da musl-fix.patch
-4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f zm-additional.sql"
+0bb99af417441e2c12cb3b8c00ecb8d76bdc343d39092a222841ae0bd684eeba1783a8bccf5630dae56f64992f8a09ec16e0cbc7069665e1ee3b62dd3f96c3a9 zm-additional.sql"
diff --git a/main/zoneminder/zm-additional.sql b/main/zoneminder/zm-additional.sql
index 0f7612a324..888071cc74 100644
--- a/main/zoneminder/zm-additional.sql
+++ b/main/zoneminder/zm-additional.sql
@@ -1,14 +1,4 @@
# Update settings to reflect alpine linux default install
update Config set Value = '/cgi-bin/zm/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/run/zoneminder' where Name = 'ZM_PATH_SOCKS';
-update Config set Value = '/var/lib/zoneminder/temp' where Name = 'ZM_PATH_SWAP';
-update Config set Value = '/var/lib/zoneminder/temp' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
-update Config set Value = '/var/lib/zoneminder/temp' where Name = 'ZM_UPLOAD_LOC_DIR';
-update Config set Value = '/var/lib/zoneminder/events' where Name = 'ZM_DIR_EVENTS';
-update Config set Value = '/var/lib/zoneminder/images' where Name = 'ZM_DIR_IMAGES';
-update Config set Value = '/var/lib/zoneminder/sounds' where Name = 'ZM_DIR_SOUNDS';
update Config set Value = '-5' where Name = 'ZM_LOG_LEVEL_SYSLOG';
update Config set Value = '0' where Name = 'ZM_LOG_LEVEL_FILE';