Commit Graph

25 Commits

Author SHA1 Message Date
Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -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 279e437545 Put back zmupdate and do more output 2018-04-14 23:07:33 -04: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 a888dac834 source files in /etc/zm/conf.d as well 2018-02-23 09:30:47 -05:00
Isaac Connor 525749c11a Need drop permissions 2018-01-29 11:44:03 -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 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 92917809b8 add creating /usr/share/zoneminder/www/cache 2017-11-01 12:49:38 -07:00
Isaac Connor 323cd3540d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-28 11:58:23 -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
Isaac Connor 77d068fc48 merge updates from SA relating to building debian packages 2017-05-26 22:25:59 -04:00
Isaac Connor c1d2407ed3 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:02:15 -04:00
Steve Gilvarry d7f7a0f074 Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
2016-05-01 13:46:09 +10:00