From eed0574f837e1131542586000d3b81ff80f76814 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 24 Apr 2018 19:56:45 +0000
Subject: zoneminder: add php/zoneminder.ini

---
 abs/core/zoneminder/PKGBUILD           | 13 +++++++++----
 abs/core/zoneminder/__changelog        |  1 +
 abs/core/zoneminder/zoneminder.ini     |  1 +
 abs/core/zoneminder/zoneminder.install |  5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 abs/core/zoneminder/zoneminder.ini

diff --git a/abs/core/zoneminder/PKGBUILD b/abs/core/zoneminder/PKGBUILD
index 4aca47d..3aaef15 100644
--- a/abs/core/zoneminder/PKGBUILD
+++ b/abs/core/zoneminder/PKGBUILD
@@ -13,7 +13,7 @@
 _pkgname=zoneminder
 pkgname=zoneminder
 pkgver=1.30.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=( i686 x86_64 mips64el arm armv7h )
 backup=( etc/zm.conf )
@@ -45,6 +45,7 @@ install=$_pkgname.install
 source=(
     https://github.com/ZoneMinder/ZoneMinder/archive/$pkgver.tar.gz
     httpd-zoneminder.conf
+    zoneminder.ini
     zoneminder.service
     uio.patch
     fabs.patch
@@ -141,16 +142,20 @@ package() {
     install -Dm644 ../zoneminder-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/zoneminder.conf
 
     #LinHES stuff
+    #/etc/php/conf.d
+    install -d -m755 ${pkgdir}/etc/php/conf.d/
+    install -D -m644 ${srcdir}/zoneminder.ini ${pkgdir}/etc/php/conf.d/zoneminder.ini
     #lighttpd zm include
-    install -D -m644 $srcdir/zm.include $pkgdir/etc/lighttpd/zm.include
+    install -D -m644 ${srcdir}/zm.include ${pkgdir}/etc/lighttpd/zm.include
     #sysctrl conf - to set the shared mem
-    install -o root -g root -D -m0755 $srcdir/zm.sysctrl.conf $pkgdir/etc/sysctl.d/zm.conf
+    install -o root -g root -D -m0755 ${srcdir}/zm.sysctrl.conf ${pkgdir}/etc/sysctl.d/zm.conf
     #gen_light_conf
-    install -D -m0744 ${srcdir}/zm_gen_light.conf $pkgdir/etc/gen_light_conf.d/zoneminder.conf
+    install -D -m0744 ${srcdir}/zm_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/zoneminder.conf
 
 }
 md5sums=('1e61836e7d938710801f4fb2b2deaaae'
          '2a0d1ff33567946b7a8ac1242270c8cc'
+         '63cdaa57c6c9a68ce51c0862bc1b74a0'
          '85baafb00bbb1bcd04cfae899b6cd395'
          'b2454d4fab43813e8e660ea4709a3102'
          '327d49273d41dc5bbd9f74defb0dc924'
diff --git a/abs/core/zoneminder/__changelog b/abs/core/zoneminder/__changelog
index f4d2281..ca5266f 100644
--- a/abs/core/zoneminder/__changelog
+++ b/abs/core/zoneminder/__changelog
@@ -8,6 +8,7 @@ PKGBUILD: add perl-sys-meminfo perl-sys-cpu
 PGKBUILD: add php-uapc
 PKGBUILD: change all /srv/ to /data/srv/ - cgidir webdir socks
 PKGBUILD: change all http to httpd dirs
+PKGBUILD: add zoneminder.ini for /etc/php/conf.d/
 PKGBUILD: add zm.include for lighttpd
 PKGBUILD: add zm.sysctrl.conf  to set the shared mem
 PKGBUILD: add zm_gen_light.conf
diff --git a/abs/core/zoneminder/zoneminder.ini b/abs/core/zoneminder/zoneminder.ini
new file mode 100644
index 0000000..231a43c
--- /dev/null
+++ b/abs/core/zoneminder/zoneminder.ini
@@ -0,0 +1 @@
+extension=apcu.so
diff --git a/abs/core/zoneminder/zoneminder.install b/abs/core/zoneminder/zoneminder.install
index 5d5459a..db07ef4 100644
--- a/abs/core/zoneminder/zoneminder.install
+++ b/abs/core/zoneminder/zoneminder.install
@@ -2,7 +2,7 @@ install_db() {
     . /etc/systemconfig
     if [ $SystemType = Master_backend -o  $SystemType = Standalone ]
     then
-        mysql -e "use zm" > /dev/null
+        mysql -e "use zm" &> /dev/null
         rc=$?
         if [ $rc = 1 ]
         then
@@ -25,6 +25,9 @@ post_install() {
     gen_light_include.py
     /sbin/sv hup /service/lighttpd
     #---
+
+    echo "To start zoneminder enter:"
+    echo "    sudo add_service.sh zoneminder"
 }
 
 post_upgrade() {
-- 
cgit v0.12

