ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

pull/1941/head
Isaac Connor 2017-06-28 16:13:45 -04:00
parent c926f733ea 323cd3540d
commit 7ecce473f6
3 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/ubuntu1204/zoneminder.dirs
View File

@ -4,3 +4,5 @@ var/cache/zoneminder/events
var/cache/zoneminder/images var/cache/zoneminder/images
var/cache/zoneminder/temp var/cache/zoneminder/temp
usr/share/zoneminder/db usr/share/zoneminder/db
etc/zm
etc/zm/conf.d

8
distros/ubuntu1204/zoneminder.postinst
View File

@ -14,6 +14,8 @@ if [ "$1" = "configure" ]; then
fi fi
# Do this every time the package is installed or upgraded # Do this every time the package is installed or upgraded
# Ensure zoneminder is stopped
invoke-rc.d zoneminder stop || true
if [ "$ZM_DB_HOST" = "localhost" ]; then if [ "$ZM_DB_HOST" = "localhost" ]; then
if [ -e "/etc/init.d/mysql" ]; then if [ -e "/etc/init.d/mysql" ]; then
@ -34,12 +36,8 @@ if [ "$1" = "configure" ]; then
echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
fi fi
# Ensure zoneminder is stopped
invoke-rc.d zoneminder stop || true
zmupdate.pl --nointeractive zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
invoke-rc.d zoneminder start || true
else else
echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.' echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
fi fi
@ -49,6 +47,8 @@ if [ "$1" = "configure" ]; then
else else
echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)" echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
fi fi
echo "Done Updating, starting ZoneMinder"
invoke-rc.d zoneminder start || true
fi fi
#DEBHELPER# #DEBHELPER#

2
distros/ubuntu1604/zoneminder.postinst
View File

@ -21,6 +21,8 @@ if [ "$1" = "configure" ]; then
# Ensure zoneminder is stopped # Ensure zoneminder is stopped
deb-systemd-invoke stop zoneminder.service || exit $? deb-systemd-invoke stop zoneminder.service || exit $?
# Ensure zoneminder is stopped
deb-systemd-invoke stop zoneminder.service || exit $?
if [ "$ZM_DB_HOST" = "localhost" ]; then if [ "$ZM_DB_HOST" = "localhost" ]; then
if [ -e "/etc/init.d/mysql" ]; then if [ -e "/etc/init.d/mysql" ]; then