rpm packaging - remove support for sysvinit aka el6
This commit is contained in:
parent
f13d174ea5
commit
02f8493b39
|
@ -207,7 +207,7 @@ set(ZM_PERL_SEARCH_PATH "" CACHE PATH
|
||||||
where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are
|
where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are
|
||||||
installed outside Perl's default search path.")
|
installed outside Perl's default search path.")
|
||||||
set(ZM_TARGET_DISTRO "" CACHE STRING
|
set(ZM_TARGET_DISTRO "" CACHE STRING
|
||||||
"Build ZoneMinder for a specific distribution. Currently, valid names are: fc24, fc25, el6, el7, OS13, FreeBSD")
|
"Build ZoneMinder for a specific distribution. Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
|
||||||
set(ZM_SYSTEMD "OFF" CACHE BOOL
|
set(ZM_SYSTEMD "OFF" CACHE BOOL
|
||||||
"Set to ON to force building ZM with systemd support. default: OFF")
|
"Set to ON to force building ZM with systemd support. default: OFF")
|
||||||
|
|
||||||
|
|
|
@ -14,24 +14,18 @@ if((NOT ZM_TARGET_DISTRO MATCHES "^fc") AND (ZM_WEB_USER STREQUAL "nginx"))
|
||||||
endif((NOT ZM_TARGET_DISTRO MATCHES "^fc") AND (ZM_WEB_USER STREQUAL "nginx"))
|
endif((NOT ZM_TARGET_DISTRO MATCHES "^fc") AND (ZM_WEB_USER STREQUAL "nginx"))
|
||||||
|
|
||||||
# Configure the zoneminder service files
|
# Configure the zoneminder service files
|
||||||
if(ZM_TARGET_DISTRO STREQUAL "el6")
|
configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
|
||||||
configure_file(sysvinit/zoneminder.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.sysvinit @ONLY)
|
if(ZM_WEB_USER STREQUAL "nginx")
|
||||||
configure_file(sysvinit/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
|
configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
|
||||||
|
configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
||||||
|
configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
|
||||||
|
configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
|
||||||
|
configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README.Fedora COPYONLY)
|
||||||
|
else(ZM_WEB_USER STREQUAL "nginx")
|
||||||
|
configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
|
||||||
configure_file(apache/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
configure_file(apache/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
||||||
else(ZM_TARGET_DISTRO STREQUAL "el6")
|
configure_file(systemd/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
|
||||||
configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
|
endif(ZM_WEB_USER STREQUAL "nginx")
|
||||||
if(ZM_WEB_USER STREQUAL "nginx")
|
|
||||||
configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
|
|
||||||
configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
|
||||||
configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
|
|
||||||
configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
|
|
||||||
configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README.Fedora COPYONLY)
|
|
||||||
else(ZM_WEB_USER STREQUAL "nginx")
|
|
||||||
configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
|
|
||||||
configure_file(apache/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
|
||||||
configure_file(systemd/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
|
|
||||||
endif(ZM_WEB_USER STREQUAL "nginx")
|
|
||||||
endif(ZM_TARGET_DISTRO STREQUAL "el6")
|
|
||||||
|
|
||||||
# Unpack jscalendar & move files into position
|
# Unpack jscalendar & move files into position
|
||||||
message(STATUS "Unpacking and Installing jscalendar...")
|
message(STATUS "Unpacking and Installing jscalendar...")
|
||||||
|
@ -74,10 +68,6 @@ if(ZM_WEB_USER STREQUAL "nginx")
|
||||||
install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
|
install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
|
||||||
endif(ZM_WEB_USER STREQUAL "nginx")
|
endif(ZM_WEB_USER STREQUAL "nginx")
|
||||||
|
|
||||||
if(ZM_TARGET_DISTRO STREQUAL "el6")
|
install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
||||||
install(FILES zoneminder.sysvinit DESTINATION /etc/rc.d/init.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
install(FILES zoneminder.tmpfiles DESTINATION /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
||||||
else(ZM_TARGET_DISTRO STREQUAL "el6")
|
|
||||||
install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
|
||||||
install(FILES zoneminder.tmpfiles DESTINATION /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
|
|
||||||
endif(ZM_TARGET_DISTRO STREQUAL "el6")
|
|
||||||
|
|
||||||
|
|
|
@ -1,180 +0,0 @@
|
||||||
What's New
|
|
||||||
==========
|
|
||||||
|
|
||||||
1. See the ZoneMinder release notes for a list of new features:
|
|
||||||
https://github.com/ZoneMinder/zoneminder/releases
|
|
||||||
|
|
||||||
2. ***EOL NOTICE***
|
|
||||||
It has become increasingly difficult to maintain the ZoneMinder project such
|
|
||||||
that it remains compatible with EL6 distros. The version of php shipped with
|
|
||||||
EL6 distros and the version of ffmpeg which will build against EL6 are too
|
|
||||||
old. It is with regret that I must announce our plans to stop supporting
|
|
||||||
ZoneMinder on EL6 distros soon. Your best option is to upgrade to an EL7
|
|
||||||
distro or another distro with newer php & ffmpeg packages. Please note that
|
|
||||||
replacing core packages, such as php, will not be supported by us. You are
|
|
||||||
on your own should you choose to go down that path.
|
|
||||||
|
|
||||||
3. The php package that ships with CentOS 6 does not support the new ZoneMinder
|
|
||||||
API. If you require API functionality (such as using a mobile app) then you
|
|
||||||
should consider an upgrade to CentOS 7 or use Fedora.
|
|
||||||
|
|
||||||
New installs
|
|
||||||
============
|
|
||||||
|
|
||||||
1. Unless you are already using MySQL server, you need to ensure that
|
|
||||||
the server is confired to start during boot and properly secured
|
|
||||||
by running:
|
|
||||||
|
|
||||||
sudo yum install mysql-server
|
|
||||||
sudo service mysqld start
|
|
||||||
/usr/bin/mysql_secure_installation
|
|
||||||
sudo chkconfig mysqld on
|
|
||||||
|
|
||||||
2. Using the password for the root account set during the previous step, you
|
|
||||||
will need to create the ZoneMinder database and configure a database
|
|
||||||
account for ZoneMinder to use:
|
|
||||||
|
|
||||||
mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
|
|
||||||
mysql -uroot -p -e "grant all on zm.* to \
|
|
||||||
'zmuser'@localhost identified by 'zmpass';"
|
|
||||||
mysqladmin -uroot -p reload
|
|
||||||
|
|
||||||
The database account credentials, zmuser/zmpass, are arbitrary. Set them to
|
|
||||||
anything that suits your environment.
|
|
||||||
|
|
||||||
3. If you have chosen to change the zoneminder database account credentials to
|
|
||||||
something other than zmuser/zmpass, you must now create a config file under
|
|
||||||
/etc/zm/conf.d and set your credentials there. For example, create the file
|
|
||||||
/etc/zm/conf.d/zm-db-user.conf and add the following content to it:
|
|
||||||
|
|
||||||
ZM_DB_USER = {username of the sql account you want to use}
|
|
||||||
ZM_DB_PASS = {password of the sql account you want to use}
|
|
||||||
|
|
||||||
Once the file has been saved, set proper file & ownership permissions on it:
|
|
||||||
|
|
||||||
sudo chown root:apache *.conf
|
|
||||||
sudo chmod 640 *.conf
|
|
||||||
|
|
||||||
4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
|
|
||||||
timezone. PHP will complain loudly if this is not set, or if it is set
|
|
||||||
incorrectly, and these complaints will show up in the zoneminder logging
|
|
||||||
system as errors
|
|
||||||
|
|
||||||
If you are not sure of the proper timezone specification to use, look at
|
|
||||||
http://php.net/date.timezone
|
|
||||||
|
|
||||||
5. Configure the web server
|
|
||||||
|
|
||||||
This package uses the HTTPS protocol by default to access the web portal,
|
|
||||||
using rhe default self signed certificate on your system. Requests using
|
|
||||||
HTTP will auto-redirect to HTTPS.
|
|
||||||
|
|
||||||
Inspect the web server configuration file and verify it meets your needs:
|
|
||||||
|
|
||||||
/etc/zm/www/zoneminder.conf
|
|
||||||
|
|
||||||
If you are running other web enabled services then you may need to edit
|
|
||||||
this file to suite. See README.https to learn about other alternatives.
|
|
||||||
|
|
||||||
When in doubt, proceed with the default:
|
|
||||||
|
|
||||||
sudo ln -s /etc/zm/www/zoneminder.conf /etc/httpd/conf.d/
|
|
||||||
sudo dnf install mod_ssl
|
|
||||||
|
|
||||||
6. Configure the web server to start automatically:
|
|
||||||
|
|
||||||
sudo chkconfig httpd on
|
|
||||||
sudo service httpd start
|
|
||||||
|
|
||||||
7. This package will automatically configure and install an SELinux policy
|
|
||||||
called local_zoneminder. A copy of this policy is in the documentation
|
|
||||||
folder.
|
|
||||||
|
|
||||||
It is still possible to run into SELinux issues, however. If this is case,
|
|
||||||
you can disable SELinux permanently by editing the following:
|
|
||||||
|
|
||||||
/etc/selinux/conf
|
|
||||||
|
|
||||||
Change SELINUX line from "enforcing" to "disabled". This change will not
|
|
||||||
take effect until a reboot, however. To avoid a reboot, execute the
|
|
||||||
following from the commandline:
|
|
||||||
|
|
||||||
sudo setenforce 0
|
|
||||||
|
|
||||||
8. Finally, you may start the ZoneMinder service:
|
|
||||||
|
|
||||||
sudo service zoneminder start
|
|
||||||
|
|
||||||
Then point your web browser to http://<machine name or ip>/zm
|
|
||||||
|
|
||||||
9. Optionally configure the firewall
|
|
||||||
|
|
||||||
All Redhat distros ship with the firewall enabled. That means you will not
|
|
||||||
be able to access the ZoneMinder web console from a remote machine until
|
|
||||||
changes are made to the firewall.
|
|
||||||
|
|
||||||
What follows are a set of minimal commands to allow remote access to the
|
|
||||||
ZoneMinder web console and also allow ZoneMinder's ONVIF discovery to
|
|
||||||
work. The following commands do not put any restrictions on which remote
|
|
||||||
machine(s) have access to the listed ports or services.
|
|
||||||
|
|
||||||
sudo iptables -A INPUT -p tcp --dport 80 -j ACCEPT
|
|
||||||
sudo iptables -A INPUT -p tcp --dport 443 -j ACCEPT
|
|
||||||
sudo iptables -A INPUT -p udp --dport 3702 -j ACCEPT
|
|
||||||
iptables-save | sudo tee /etc/sysconfig/iptables
|
|
||||||
|
|
||||||
Additional changes to the firewall may be required, depending on your
|
|
||||||
security requirements and how you use the system. It is up to you to verify
|
|
||||||
these commands are sufficient.
|
|
||||||
|
|
||||||
10. Access the ZoneMinder web console
|
|
||||||
|
|
||||||
You may now access the ZoneMinder web console from your web browser using
|
|
||||||
an appropriate url. Here are some examples:
|
|
||||||
|
|
||||||
http://localhost/zm (works from the local machine only)
|
|
||||||
http://{machine name}/zm (works only if dns is configured for your network)
|
|
||||||
http://{ip address}/zm
|
|
||||||
|
|
||||||
Upgrades
|
|
||||||
========
|
|
||||||
|
|
||||||
1. Conf.d folder support has been added to ZoneMinder 1.31.0. Any custom
|
|
||||||
changes previously made to zm.conf must now be made in one or more custom
|
|
||||||
config files, created under the conf.d folder. Do this now. See
|
|
||||||
/etc/zm/conf.d/README for details. Once you recreate any custom config changes
|
|
||||||
under the conf.d folder, they will remain in place indefinitely.
|
|
||||||
|
|
||||||
2. Verify permissions of the zmuser account.
|
|
||||||
|
|
||||||
Over time, the database account permissions required for normal operation
|
|
||||||
have increased. Verify the zmuser database account has been granted all
|
|
||||||
permission to the ZoneMinder database:
|
|
||||||
|
|
||||||
mysql -uroot -p -e "show grants for zmuser@localhost;"
|
|
||||||
|
|
||||||
See step 2 of the Installation section to add missing permissions.
|
|
||||||
|
|
||||||
3. Verify the ZoneMinder Apache configuration file in the folder
|
|
||||||
/etc/zm/www. You will have a file called "zoneminder.conf" and there
|
|
||||||
may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
|
|
||||||
exists, inspect it and merge anything new in that file with zoneminder.conf.
|
|
||||||
Verify the SSL REquirements meet your needs. Read README.https if necessary.
|
|
||||||
|
|
||||||
4. Upgrade the database before starting ZoneMinder.
|
|
||||||
|
|
||||||
Most upgrades can be performed by executing the following command:
|
|
||||||
|
|
||||||
sudo zmupdate.pl
|
|
||||||
|
|
||||||
Recent versions of ZoneMinder don't require any parameters added to the
|
|
||||||
zmupdate command. However, if ZoneMinder complains, you may need to call
|
|
||||||
zmupdate in the following manner:
|
|
||||||
|
|
||||||
sudo zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
|
|
||||||
|
|
||||||
5. Now restart the web server then start zoneminder:
|
|
||||||
|
|
||||||
sudo service httpd restart
|
|
||||||
sudo service zoneminder start
|
|
||||||
|
|
|
@ -1,121 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
|
|
||||||
# chkconfig: - 99 00
|
|
||||||
# processname: zmpkg.pl
|
|
||||||
|
|
||||||
# Source function library.
|
|
||||||
. /etc/rc.d/init.d/functions
|
|
||||||
|
|
||||||
prog=ZoneMinder
|
|
||||||
ZM_CONFIG="@ZM_CONFIG@"
|
|
||||||
pidfile="@ZM_RUNDIR@"
|
|
||||||
LOCKFILE=/var/lock/subsys/zm
|
|
||||||
|
|
||||||
loadconf()
|
|
||||||
{
|
|
||||||
if [ -f $ZM_CONFIG ]; then
|
|
||||||
. $ZM_CONFIG
|
|
||||||
else
|
|
||||||
echo "ERROR: $ZM_CONFIG not found."
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
loadconf
|
|
||||||
command="$ZM_PATH_BIN/zmpkg.pl"
|
|
||||||
|
|
||||||
start()
|
|
||||||
{
|
|
||||||
# Commenting out as it is not needed. Leaving as a placeholder for future use.
|
|
||||||
# zmupdate || return $?
|
|
||||||
loadconf || return $?
|
|
||||||
#Make sure the directory for our PID folder exists or create one.
|
|
||||||
[ ! -d $pidfile ] \
|
|
||||||
&& mkdir -m 774 $pidfile \
|
|
||||||
&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
|
|
||||||
#Make sure the folder for the socks file exists or create one
|
|
||||||
GetPath="select Value from Config where Name='ZM_PATH_SOCKS'"
|
|
||||||
dbHost=`echo $ZM_DB_HOST | cut -d: -f1`
|
|
||||||
dbPort=`echo $ZM_DB_HOST | cut -d: -s -f2`
|
|
||||||
if [ "$dbPort" = "" ]
|
|
||||||
then
|
|
||||||
ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$ZM_DB_HOST -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
|
|
||||||
else
|
|
||||||
ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$dbHost -P$dbPort -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
|
|
||||||
fi
|
|
||||||
[ ! -d $ZM_PATH_SOCK ] \
|
|
||||||
&& mkdir -m 774 $ZM_PATH_SOCK \
|
|
||||||
&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
|
|
||||||
echo -n $"Starting $prog: "
|
|
||||||
$command start
|
|
||||||
RETVAL=$?
|
|
||||||
[ $RETVAL = 0 ] && success || failure
|
|
||||||
echo
|
|
||||||
[ $RETVAL = 0 ] && touch $LOCKFILE
|
|
||||||
return $RETVAL
|
|
||||||
}
|
|
||||||
|
|
||||||
stop()
|
|
||||||
{
|
|
||||||
loadconf
|
|
||||||
echo -n $"Stopping $prog: "
|
|
||||||
$command stop
|
|
||||||
RETVAL=$?
|
|
||||||
[ $RETVAL = 0 ] && success || failure
|
|
||||||
echo
|
|
||||||
[ $RETVAL = 0 ] && rm -f $LOCKFILE
|
|
||||||
}
|
|
||||||
|
|
||||||
zmstatus()
|
|
||||||
{
|
|
||||||
loadconf
|
|
||||||
result=`$command status`
|
|
||||||
if [ "$result" = "running" ]; then
|
|
||||||
echo "ZoneMinder is running"
|
|
||||||
$ZM_PATH_BIN/zmu -l
|
|
||||||
RETVAL=0
|
|
||||||
else
|
|
||||||
echo "ZoneMinder is stopped"
|
|
||||||
RETVAL=1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
zmupdate()
|
|
||||||
{
|
|
||||||
if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then
|
|
||||||
$ZM_PATH_BIN/zmupdate.pl -f
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
'start')
|
|
||||||
start
|
|
||||||
;;
|
|
||||||
'stop')
|
|
||||||
stop
|
|
||||||
;;
|
|
||||||
'restart')
|
|
||||||
stop
|
|
||||||
start
|
|
||||||
;;
|
|
||||||
'condrestart')
|
|
||||||
loadconf
|
|
||||||
result=`$ZM_PATH_BIN/zmdc.pl check`
|
|
||||||
if [ "$result" = "running" ]; then
|
|
||||||
$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
|
|
||||||
rm -f $LOCKFILE
|
|
||||||
start
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
'status')
|
|
||||||
status httpd
|
|
||||||
status mysqld
|
|
||||||
zmstatus
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Usage: $0 { start | stop | restart | condrestart | status }"
|
|
||||||
RETVAL=1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
exit $RETVAL
|
|
|
@ -1,7 +0,0 @@
|
||||||
@ZM_LOGDIR@/*log
|
|
||||||
{
|
|
||||||
weekly
|
|
||||||
notifempty
|
|
||||||
missingok
|
|
||||||
create 660 @WEB_USER@ @WEB_GROUP@
|
|
||||||
}
|
|
|
@ -22,13 +22,6 @@
|
||||||
%global with_apcu_bc 1
|
%global with_apcu_bc 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Include files for SysV init or systemd
|
|
||||||
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
|
|
||||||
%global with_init_systemd 1
|
|
||||||
%else
|
|
||||||
%global with_init_sysv 1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora}
|
%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora}
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
|
@ -49,12 +42,10 @@ Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zon
|
||||||
Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
|
Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
|
||||||
Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version}.tar.gz#/cakephp-enum-behavior-%{ceb_version}.tar.gz
|
Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version}.tar.gz#/cakephp-enum-behavior-%{ceb_version}.tar.gz
|
||||||
|
|
||||||
%{?with_init_systemd:BuildRequires: systemd-devel}
|
BuildRequires: systemd-devel
|
||||||
%{?with_init_systemd:BuildRequires: mariadb-devel}
|
BuildRequires: mariadb-devel
|
||||||
%{?with_init_systemd:BuildRequires: perl-podlators}
|
BuildRequires: perl-podlators
|
||||||
%{?with_init_systemd:BuildRequires: polkit-devel}
|
BuildRequires: polkit-devel
|
||||||
%{?with_init_sysv:BuildRequires: mysql-devel}
|
|
||||||
%{?el6:BuildRequires: epel-rpm-macros}
|
|
||||||
BuildRequires: cmake >= 2.8.7
|
BuildRequires: cmake >= 2.8.7
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: gnutls-devel
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
|
@ -119,19 +110,10 @@ Requires: perl(LWP::Protocol::https)
|
||||||
Requires: ca-certificates
|
Requires: ca-certificates
|
||||||
Requires: zip
|
Requires: zip
|
||||||
|
|
||||||
%{?with_init_systemd:Requires(post): systemd}
|
Requires(post): systemd
|
||||||
%{?with_init_systemd:Requires(post): systemd-sysv}
|
Requires(post): systemd-sysv
|
||||||
%{?with_init_systemd:Requires(preun): systemd}
|
Requires(preun): systemd
|
||||||
%{?with_init_systemd:Requires(postun): systemd}
|
Requires(postun): systemd
|
||||||
|
|
||||||
%{?with_init_sysv:Requires(post): /sbin/chkconfig}
|
|
||||||
%{?with_init_sysv:Requires(post): %{_bindir}/checkmodule}
|
|
||||||
%{?with_init_sysv:Requires(post): %{_bindir}/semodule_package}
|
|
||||||
%{?with_init_sysv:Requires(post): %{_sbindir}/semodule}
|
|
||||||
%{?with_init_sysv:Requires(preun): /sbin/chkconfig}
|
|
||||||
%{?with_init_sysv:Requires(preun): /sbin/service}
|
|
||||||
%{?with_init_sysv:Requires(preun): %{_sbindir}/semodule}
|
|
||||||
%{?with_init_sysv:Requires(postun): /sbin/service}
|
|
||||||
|
|
||||||
Requires(post): %{_bindir}/gpasswd
|
Requires(post): %{_bindir}/gpasswd
|
||||||
Requires(post): %{_bindir}/less
|
Requires(post): %{_bindir}/less
|
||||||
|
@ -192,24 +174,10 @@ find %{buildroot}%{_datadir}/zoneminder/www/api \( -name cake -or -name cake.php
|
||||||
%{__ln_s} ../../../../../../../..%{_sysconfdir}/pki/tls/certs/ca-bundle.crt %{buildroot}%{_datadir}/zoneminder/www/api/lib/Cake/Config/cacert.pem
|
%{__ln_s} ../../../../../../../..%{_sysconfdir}/pki/tls/certs/ca-bundle.crt %{buildroot}%{_datadir}/zoneminder/www/api/lib/Cake/Config/cacert.pem
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%if 0%{?with_init_sysv}
|
|
||||||
/sbin/chkconfig --add zoneminder
|
|
||||||
/sbin/chkconfig zoneminder on
|
|
||||||
|
|
||||||
# Create and load zoneminder selinux policy module
|
|
||||||
echo -e "\nCreating and installing a ZoneMinder SELinux policy module. Please wait.\n"
|
|
||||||
%{_bindir}/checkmodule -M -m -o %{_docdir}/%{name}-%{version}/local_zoneminder.mod %{_docdir}/%{name}-%{version}/local_zoneminder.te > /dev/null 2>&1 || :
|
|
||||||
%{_bindir}/semodule_package -o %{_docdir}/%{name}-%{version}/local_zoneminder.pp -m %{_docdir}/%{name}-%{version}/local_zoneminder.mod > /dev/null 2>&1 || :
|
|
||||||
%{_sbindir}/semodule -i %{_docdir}/%{name}-%{version}/local_zoneminder.pp > /dev/null 2>&1 || :
|
|
||||||
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_init_systemd}
|
|
||||||
# Initial installation
|
# Initial installation
|
||||||
if [ $1 -eq 1 ] ; then
|
if [ $1 -eq 1 ] ; then
|
||||||
%systemd_post %{name}.service
|
%systemd_post %{name}.service
|
||||||
fi
|
fi
|
||||||
%endif
|
|
||||||
|
|
||||||
# Upgrade from a previous version of zoneminder
|
# Upgrade from a previous version of zoneminder
|
||||||
if [ $1 -eq 2 ] ; then
|
if [ $1 -eq 2 ] ; then
|
||||||
|
@ -263,34 +231,11 @@ EOF
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%if 0%{?with_init_sysv}
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
/sbin/service zoneminder stop > /dev/null 2>&1 || :
|
|
||||||
/sbin/chkconfig --del zoneminder
|
|
||||||
echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n"
|
|
||||||
%{_sbindir}/semodule -r local_zoneminder.pp
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_init_systemd}
|
|
||||||
%systemd_preun %{name}.service
|
%systemd_preun %{name}.service
|
||||||
%endif
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%if 0%{?with_init_sysv}
|
|
||||||
if [ $1 -ge 1 ]; then
|
|
||||||
/sbin/service zoneminder condrestart > /dev/null 2>&1 || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove the doc folder.
|
|
||||||
rm -rf %{_docdir}/%{name}-%{version}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_init_systemd}
|
|
||||||
%systemd_postun_with_restart %{name}.service
|
%systemd_postun_with_restart %{name}.service
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_init_systemd}
|
|
||||||
%triggerun -- zoneminder < 1.25.0-4
|
%triggerun -- zoneminder < 1.25.0-4
|
||||||
# Save the current service runlevel info
|
# Save the current service runlevel info
|
||||||
# User must manually run systemd-sysv-convert --apply zoneminder
|
# User must manually run systemd-sysv-convert --apply zoneminder
|
||||||
|
@ -300,7 +245,6 @@ rm -rf %{_docdir}/%{name}-%{version}
|
||||||
# Run these because the SysV package being removed won't do them
|
# Run these because the SysV package being removed won't do them
|
||||||
/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
|
/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
|
||||||
/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
|
/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
|
||||||
%endif
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
@ -325,18 +269,11 @@ rm -rf %{_docdir}/%{name}-%{version}
|
||||||
%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf
|
%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?with_init_systemd}
|
|
||||||
%{_tmpfilesdir}/zoneminder.conf
|
%{_tmpfilesdir}/zoneminder.conf
|
||||||
%{_unitdir}/zoneminder.service
|
%{_unitdir}/zoneminder.service
|
||||||
%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
|
%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
|
||||||
%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
|
%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
|
||||||
%{_bindir}/zmsystemctl.pl
|
%{_bindir}/zmsystemctl.pl
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?with_init_sysv}
|
|
||||||
%doc distros/redhat/misc/local_zoneminder.te
|
|
||||||
%attr(755,root,root) %{_initrddir}/zoneminder
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%{_bindir}/zma
|
%{_bindir}/zma
|
||||||
%{_bindir}/zmaudit.pl
|
%{_bindir}/zmaudit.pl
|
||||||
|
@ -380,6 +317,12 @@ rm -rf %{_docdir}/%{name}-%{version}
|
||||||
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder
|
%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/run/zoneminder
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Apr 22 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.31.42-1
|
||||||
|
- Remove support for sysvinit a.k.a. el6
|
||||||
|
- use desktop-file-install for new zoneminder.desktop file
|
||||||
|
- add new web cache folder
|
||||||
|
- 1.31.42 development snapshot
|
||||||
|
|
||||||
* Tue May 09 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.4-1
|
* Tue May 09 2017 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.30.4-1
|
||||||
- modify autosetup macro parameters
|
- modify autosetup macro parameters
|
||||||
- modify requirements for php-pecl-acpu-bc package
|
- modify requirements for php-pecl-acpu-bc package
|
||||||
|
|
Loading…
Reference in New Issue