Commit Graph

158 Commits

Author SHA1 Message Date
Isaac Connor fd480110d9 Make Isaac the upload/maintainer 2019-10-16 09:16:22 -04:00
Isaac Connor 193a71dfbd add libavresample-dev to depends 2019-09-13 16:10:15 -04:00
Isaac Connor f813741730 Add maxage 7 to logrotate config so that it will clear out all the zms_e logs. 2019-08-16 11:31:27 -04:00
Isaac Connor 0699b21017 Remove libjson-any-perl as a dependency. Fixes #2630 2019-06-03 09:45:50 -04:00
Isaac Connor c4d76f03c9 Introduce ZM_PATH_SHUTDOWN to cmake config 2019-05-27 12:09:32 -04:00
Isaac Connor 2ce2381269 Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-19 08:45:42 -04:00
Pliable Pixels 33db7e1e35 add libssl1.0.0 for ubuntu 16/12 2019-05-18 13:47:31 -04:00
Pliable Pixels 304192472d removed extra line 2019-05-17 12:02:24 -04:00
Pliable Pixels 682d95470d spaces 2019-05-17 11:47:20 -04:00
Isaac Connor 88a58243bc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 11:24:40 -04:00
Pliable Pixels e2dd11fdd4 added deps to ubuntu control files 2019-05-17 11:21:07 -04:00
Isaac Connor e9ff1f46f1 Add missing deps to ubuntu versions of control 2019-05-17 11:13:45 -04:00
Isaac Connor 17e0b4ac4b test for error code from db creation and if there is an error, die with an error code. 2019-05-17 08:34:19 -04:00
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
Isaac Connor dbafffecb8 remove extra \ 2018-09-26 16:20:08 -04:00
Andrew Bauer 029c6401af add libjson-maybexs-perl as a debian package dependency 2018-08-31 09:34:54 -05: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
Isaac Connor 1907b18ac2 fix libnumber-bytes-human => libnumber-bytes-human-perl 2018-04-25 12:36:18 -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 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 a888dac834 source files in /etc/zm/conf.d as well 2018-02-23 09:30:47 -05:00
Isaac Connor 7074681e60 Need drop permissions 2018-01-29 11:44:29 -05:00
Isaac Connor 2427a5bf63 sync up .service file to match 1604. 2018-01-08 16:13:11 -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 004a41b122 remove boost dependency. 2017-12-04 22:59:50 -05:00
Isaac Connor 00e963eba4 remove the dependency on boost 2017-11-28 07:17:26 -05: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 c3c6459052 Merge branch 'montagereview_rework' into storageareas 2017-07-05 15:34:02 -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 2e60864e99 always stop and start zm on upgrade, not just if doing a db update 2017-06-20 09:44:18 -04:00
Isaac Connor f78e720db3 add /etc/zm and /etc/zm/conf.d to install dirs 2017-06-20 09:41:35 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908)
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor 371b86300a Merge branch 'master' into storageareas 2017-06-08 14:23:40 -04:00
Andrew Bauer 2bc6f1627e Add support for conf.d subfolder (#1902)
* cmake changes to support conf.d

* php changes to support conf.d

* perl changes to support conf.d

* C changes to support conf.d

* add conf.d support to rpmspecfile

* fix typo

* specify ZM_CONFIG_SUBDIR in relevant target distros

* put back my config_file perl definition

* remove quotes from ZM macros

* fix snprintf

* add README to conf.d folder

* adjust rpm specfile

* remove custom permissions from README in rpmspecfile

* modify rpm README documentation to reflect conf.d support

* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor 44eba78e40 put back empty files 2017-06-02 20:42:55 -04:00
Isaac Connor b5c0a0eae2 the contents of these are not being maintained and should be generated by scripts 2017-06-02 12:40:32 -04:00
Isaac Connor c93e13868e change to quilt frmo native. Remove patches. We are upstream. 2017-06-01 12:41:10 -04:00
Isaac Connor 0e643f0f93 Merge branch 'master' into storageareas 2017-05-30 11:58:38 -04:00
Isaac Connor 94151b0318 put back changelog 2017-05-26 14:30:21 -04:00
Isaac Connor 099e099352 We need boost for the packetqueue 2017-05-23 14:51:25 -04:00
Isaac Connor 392ade2e1a change default logrotate policy to rotate daily and compress 2017-05-23 14:51:09 -04:00
Isaac Connor 7756d5067c the changelog entries are irrelevant, so don't keep them. Package scripts will generate their contents 2017-05-23 14:46:54 -04:00