Isaac Connor
7314926718
Detect mysql when mysql is run by sysv init scripts
2018-09-23 16:53:50 -04:00
Andrew Bauer
029c6401af
add libjson-maybexs-perl as a debian package dependency
2018-08-31 09:34:54 -05:00
Andrew Bauer
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
Matt N
50f81c50b2
Grant access to the new cache directory in Apache on Ubuntu ( #2130 )
...
This fixes a regression from #2083 and aligns with generate_apache_config.pl and the changes for Debian
2018-06-18 10:18:55 -04:00
Andrew Bauer
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
Isaac Connor
48d5fa00d4
remove libsys-cpuload-perl as a dependency
2018-04-17 21:10:55 -04:00
Isaac Connor
279e437545
Put back zmupdate and do more output
2018-04-14 23:07:33 -04:00
Isaac Connor
e28ecf8e28
add libfile-slurp-perl as a dependency
2018-04-05 10:00:14 -04:00
Isaac Connor
4d6e5d0ab6
Add libnumber-bytes-human-perl as a dependency
2018-03-28 08:21:17 -07:00
Isaac Connor
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
Matthew Trescott
afc3e160a7
Fix the second part of #2064 ( #2066 )
...
* Fix postinst with mysql. See bug #2064
* Fix mistake
2018-03-21 11:05:48 -04:00
Isaac Connor
4bb26519f6
allow errors, and add a missing fi
2018-03-16 11:59:29 -04:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
a73a7b438c
whitespace to google code style specs. 2 spaces
2018-03-14 10:44:43 -04:00
Andy Bauer
00ab9b4c03
merge proposed changes in ubuntu1804 folder -> ubuntu1604 folder instead
2018-03-13 09:28:11 -05:00
Isaac Connor
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
Isaac Connor
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
Isaac Connor
a888dac834
source files in /etc/zm/conf.d as well
2018-02-23 09:30:47 -05:00
Andrew Bauer
c7aa45c4ce
libmysqlclient-dev debian package name changes
2018-02-19 20:21:21 -06:00
Isaac Connor
525749c11a
Need drop permissions
2018-01-29 11:44:03 -05:00
Isaac Connor
3e31203a22
default service start timeout to 5 minutes. THe default of 1.5 minutes is too short on some larger systems
2018-01-08 16:11:54 -05:00
Isaac Connor
2cc185fd45
Move Updating Storage stats to a trigger. Remove the code from zmwatch that did it before
2018-01-04 13:06:28 -05:00
Isaac Connor
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
Andrew Bauer
0d9f330356
call zmcamtool during postinst ( #2021 )
2017-12-10 14:14:39 -05:00
Isaac Connor
bbe75762e7
remove boost
2017-12-07 09:40:00 -05:00
Isaac Connor
004a41b122
remove boost dependency.
2017-12-04 22:59:50 -05:00
Isaac Connor
1392c1dfc2
put back missing test for if db is local
2017-11-22 12:36:04 -08:00
Isaac Connor
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
Isaac Connor
dae2a6ae0a
fixup the .postinst file which got some duplicate lines
2017-11-20 11:56:05 -05:00
Isaac Connor
2570869aa0
bring back libvlc
2017-11-08 11:18:54 -05:00
Isaac Connor
b6548ba137
put curl back, we use it's decoding function for urls
2017-11-07 15:54:13 -05:00
Isaac Connor
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
Isaac Connor
92917809b8
add creating /usr/share/zoneminder/www/cache
2017-11-01 12:49:38 -07:00
Isaac Connor
fc3934c8bb
kill off curl and libvlc
2017-10-25 13:20:18 -07:00
Isaac Connor
ca17d9dba4
change the systemd zoneminder.server to always restart zoneminder with a 10 second wait
2017-10-24 16:24:23 -07:00
Isaac Connor
199f90868a
add libsys-cpuload-perl as a dependency
2017-10-24 15:17:09 -07:00
APHW2 MFGENG
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
Isaac Connor
7520f4ddb5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-26 10:39:28 -04:00
Isaac Connor
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
Andrew Bauer
91ccba137f
Don't create symlinks in ZoneMinder webroot ( #1923 )
...
* don't create symlinks during rpm packaging
* don't use symlinks when pacakging debs
* change default values for zm_dir_events and zm_dir_images
* remove zm_contentdir cmake var from debian packaging
* change default for zm_config_subdir
* update INSTALL documentation
2017-07-21 08:18:13 -04:00
Isaac Connor
cfcf7363ea
Don't test the symlinks anymore
2017-07-11 11:18:47 -04:00
Isaac Connor
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
Isaac Connor
69509689e0
debian stretch prefers libmariadbclient-dev and libgcrypt11-dev
2017-06-29 08:41:18 -04:00
Isaac Connor
323cd3540d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-28 11:58:23 -04:00
Isaac Connor
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
Andrew Bauer
043b382bdd
include conf.d folder contents in debian packaging ( #1934 )
2017-06-26 14:44:33 -04:00
Isaac Connor
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
Isaac Connor
5ee230a141
always restart zoneminder on upgrade, not just when doing a db update
2017-06-21 17:20:50 -04:00
Isaac Connor
42a022d15b
always stop and start zoneminder on upgrade
2017-06-20 09:41:02 -04:00
Isaac Connor
db68d3e0a2
use restart instead of start
2017-06-19 13:57:00 -04:00