From ac7c73deb19d5345f0b33f5c79f07b9fb12d0f2e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 20 Dec 2014 23:34:51 +0000
Subject: zoneminder: more changes to .install

---
 abs/core/zoneminder/PKGBUILD           |  2 +-
 abs/core/zoneminder/__changelog        |  2 +-
 abs/core/zoneminder/zoneminder.install | 57 ----------------------------------
 3 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/abs/core/zoneminder/PKGBUILD b/abs/core/zoneminder/PKGBUILD
index a6402e8..00f47a6 100644
--- a/abs/core/zoneminder/PKGBUILD
+++ b/abs/core/zoneminder/PKGBUILD
@@ -11,7 +11,7 @@
 pkgbase=zoneminder
 pkgname=zoneminder
 pkgver=1.28.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=( i686 x86_64 mips64el arm )
      
diff --git a/abs/core/zoneminder/__changelog b/abs/core/zoneminder/__changelog
index eb1e8ea..957bf36 100644
--- a/abs/core/zoneminder/__changelog
+++ b/abs/core/zoneminder/__changelog
@@ -12,5 +12,5 @@ Removed modifications of php.ini
 Added remove/add of zm.include in post install/remove
 added install_db
 add http to video group
-gen_light_conf.py
+gen_light_include.py
 --
diff --git a/abs/core/zoneminder/zoneminder.install b/abs/core/zoneminder/zoneminder.install
index 1d450aa..b45cdaa 100644
--- a/abs/core/zoneminder/zoneminder.install
+++ b/abs/core/zoneminder/zoneminder.install
@@ -58,44 +58,6 @@ post_install() {
         chown http.http /tmp/zm
     fi
 
-    # edit /etc/php.ini for Zoneminder
-    sed -e '
-    # Enable these libraries by removing the leading comment character
-    \|^;extension=mysql.so$| s|^;||;
-    \|^;extension=mysqli.so$| s|^;||;
-    \|^;extension=pdo_mysql.so$| s|^;||;
-    \|^;extension=gd.so$| s|^;||;
-    \|^;extension=gettext.so$| s|^;||;
-    \|^;extension=mcrypt.so$| s|^;||;
-    \|^;extension=session.so$| s|^;||;
-    \|^;extension=sockets.so$| s|^;||;
-    \|^;extension=openssl.so$| s|^;||;
-    \|^;extension=ftp.so$| s|^;||;
-    \|^;extension=zip.so$| s|^;||;
-    
-    # Add zoneminder paths to open_basedir
-    s|^open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/$|&:/etc:/srv/http/zoneminder/:/var/cache/zoneminder/|;
-    ' /etc/php/php.ini > /etc/php/php.ini.zoneminder
-
-    # edit /etc/httpd/conf/httpd.conf for Zoneminder
-    sed -e '
-    # Use mod_mpm_prefork instead of mod_mpm_event.so (FS#39218).
-    s|^LoadModule mpm_event_module modules/mod_mpm_event.so$|#&\nLoadModule mpm_prefork_module modules/mod_mpm_prefork.so|;
-    
-    # Zoneminder requires cgi
-    \|^#LoadModule cgi_module modules/mod_cgi.so$| s|#||;
-    
-    # libphp5
-    \|^LoadModule php5_module modules/libphp5.so$|d;
-    s|^#*LoadModule rewrite_module modules/mod_rewrite.so$|&\nLoadModule php5_module modules/libphp5.so|;
-    \|^Include /etc/httpd/conf/extra/php5_module.conf|d;
-    s|^Include conf/extra/httpd-default.conf$|&\nInclude /etc/httpd/conf/extra/php5_module.conf|;
-    
-    # Include httpd-zoneminder.conf
-    \|^Include /etc/httpd/conf/extra/httpd-zoneminder.conf$|d;
-    s|^# Server-pool management (MPM specific)$|\nInclude /etc/httpd/conf/extra/httpd-zoneminder.conf\n&|;    
-    ' /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.zoneminder
-
     #---LinHES Stuff
     usermod -G video http
     install_db
@@ -104,18 +66,6 @@ post_install() {
     #---
     
     cat << EOF
-Note for mysql:
-==> To run Zoneminder, you must install the database running mysql service (as root):
-==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
-==> and add Zoneminder database typing (with passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
-==> (or without passsword):
-==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload"
-==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf"
-==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
-
 Note for php:
 ==> You must uncomment that line in /etc/php/php.ini:
 ==> "extension=mysql.so"
@@ -134,13 +84,6 @@ Note for php:
 ==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
 ==> and set your timezone in php.ini:
 ==> "date.timezone = <your_country>/<your_city>"
-
-Note for apache:
-==> You must edit /etc/httpd/conf/httpd.conf and add the line:
-==> "LoadModule php5_module modules/libphp5.so"
-==> and:
-==> "Include /etc/httpd/conf/extra/php5_module.conf"
-==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
 EOF
 }
 
-- 
cgit v0.12

