Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 87 insertions, 33 deletions

diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index 5e62cc23e..899e2a5d1 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -8,7 +8,7 @@ pre_install() {
     fi
   fi
   if [ -L /srv/http/zoneminder/images ]; then
-    l=$(readlink /srv/http/zoneminder/images )
+    l=$(readlink /srv/http/zoneminder/images)
     if [ $l != /var/cache/zoneminder/images ]; then
         abort=true
     fi
@@ -26,23 +26,73 @@ EOF
 }
 
 post_install() {
-  if [ -d /var/log/zoneminder ]; then
-    mkdir -m 0755 /var/log/zoneminder
+  if [[ -d /var/log/zoneminder ]]; then
+    chmod 0755 /var/log/zoneminder
     chown http.http /var/log/zoneminder
   else
-    chmod 0755 /var/log/zoneminder
+    mkdir -m 0755 /var/log/zoneminder
     chown http.http /var/log/zoneminder
   fi
+  if [[ -d /tmp/zoneminder ]]; then
+    chmod 0700 /tmp/zoneminder
+    chown http.http /tmp/zoneminder
+  else
+    mkdir -m 0700 /tmp/zoneminder
+    chown http.http /tmp/zoneminder
+  fi
+  sed -i -e '
+    /^;extension=mysql.so/ s/^;//;
+    /^#extension=mysql.so/ s/^#//;
+    /^;extension=mysqli.so/ s/^;//;
+    /^#extension=mysqli.so/ s/^#//;
+    /^;extension=gd.so/ s/^;//;
+    /^#extension=gd.so/ s/^#//;
+    /^;extension=gettext.so/ s/^;//;
+    /^#extension=gettext.so/ s/^#//;
+    /^;extension=mcrypt.so/ s/^;//;
+    /^#extension=mcrypt.so/ s/^#//;
+    /^;extension=session.so/ s/^;//;
+    /^#extension=session.so/ s/^#//;
+    /^;extension=sockets.so/ s/^;//;
+    /^#extension=sockets.so/ s/^#//;
+    /^;extension=openssl.so/ s/^;//;
+    /^#extension=openssl.so/ s/^#//;
+    /^;extension=ftp.so/ s/^;//;
+    /^#extension=ftp.so/ s/^#//;
+    /^;extension=zip.so/ s/^;//;
+    /^#extension=zip.so/ s/^#//;
+    /^;open_basedir/ s/^;//;
+    /^#open_basedir/ s/^#//;
+    /^open_basedir/ s/:\/etc//;
+    /^open_basedir/ s/:\/etc\///;
+    /^open_basedir/ s/$/:\/etc/;
+    /^open_basedir/ s/:\/srv\/http\/zoneminder//;
+    /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
+    /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
+    ' /etc/php/php.ini || read
+  sed -i -e '
+    /^LoadModule php5_module modules\/libphp5.so/d;
+    /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/;
+    /^# PHP 5/d;
+    /^# ZoneMinder/d;
+    /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d;
+    /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
+    /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
+    ' /etc/httpd/conf/httpd.conf || read
   cat << EOF
-Note:
+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:
+==> 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:
+Note for php:
 ==> You must uncomment that line in /etc/php/php.ini:
 ==> "extension=mysql.so"
 ==> check and make sure these are uncommented:
@@ -52,55 +102,59 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-
-==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and
-==> "/usr/share/zoneminder" like so
+==> "extension=openssl.so"
+==> "extension=ftp.so"
+==> "extension=zip.so"
+==> check and add to open_basedir "/etc" and
+==> "/srv/http/zoneminder" like so
 ==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
-==> Otherwise ZoneMinder will be unable to read /etc/zm.conf
-==> or display its own web directory
-==> And set your timezone in php.ini: date.timezone = <my_country>/<my_city>
+==> and set your timezone in php.ini:
+==> "date.timezone = <your_country>/<your_city>"
 
-Note:
+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-zm.conf"
+==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
 EOF
 }
 
 post_upgrade() {
+  post_install
   /usr/bin/zmupdate.pl -f >/dev/null
-  if [ -d /var/log/zoneminder ]; then
-    mkdir -m 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
-  else
-    chmod 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
-  fi
 }
 
 post_remove() {
-  if [ -d /run/zoneminder ]; then
-    rm -vr /run/zoneminder
-  fi
-  if [ -d /tmp/zoneminder ]; then
+  if [[ -d /tmp/zoneminder ]]; then
     rm -vr /tmp/zoneminder
   fi
+  sed -i -e '
+    /^open_basedir/ s/:\/srv\/http\/zoneminder//;
+    /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
+    ' /etc/php/php.ini || read
+  sed -i -e '
+    /^# ZoneMinder/d;
+    /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
+    ' /etc/httpd/conf/httpd.conf || read
   cat << EOF
 Note:
-==> To clean Zoneminder mysql database, run as root:
+==> To clean Zoneminder mysql database, run as root (with password):
 ==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
 ==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
 ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm"
+==> (or without password):
+==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
+==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql"
+==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm"
 
 ==> Disable http with php if it isn't needed with others servers, 
 ==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
 ==> "LoadModule php5_module modules/libphp5.so"
 ==> "Include /etc/httpd/conf/extra/php5_module.conf"
 
-==> Remove
-==> "Include /etc/httpd/conf/extra/httpd-zm.conf"
+==> Remove line in /etc/httpd/conf/httpd.conf:
+==> "Include /etc/httpd/conf/extra/httpd-zoneminder.conf"
 
 ==> Disable php with mysql if it isn't needed with others servers, 
 ==> comment that lines in /etc/php/php.ini:
@@ -113,11 +167,11 @@ Note:
 ==> "extension=sockets.so"
 ==> "date.timezone = <my_country>/<my_city>"
 
-==> Edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder/www"
-==> in the open_basedir.
+==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
+==> in the "open_basedir".
 
-==> Remove log files and 'zonemider' directory in "/var/log/zoneminder"
+==> Remove log files and "zonemider" directory in "/var/log/zoneminder".
 
-==> Backup and remove events images and temp dirs in "/var/cache/zoneminder"
+==> Backup and remove "events", "images" and "temp" dirs in "/var/cache/zoneminder".
 EOF
 }