Commit Graph

931 Commits

Author SHA1 Message Date
Andrew Bauer 8eb4195cb7 rpm specfile - update git submodules 2018-04-18 15:00:55 -05:00
Isaac Connor 8c0ad8d1f3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-17 22:57:44 -04:00
Andrew Bauer 456b1b59df
rpm specfile - bump crud to 3.1.0 2018-04-17 20:27:28 -05:00
Isaac Connor 48d5fa00d4 remove libsys-cpuload-perl as a dependency 2018-04-17 21:10:55 -04:00
Andy Bauer 3a80c60d2e rpm spefile changes - account for new files 2018-04-17 15:13:38 -05:00
Andrew Bauer 08447de7ca
bump rpm specfile version 2018-04-17 14:53:55 -05: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
Matthew Trescott ee146acf07 Remove obsolete symlink handling, update README.Debian 2018-03-06 20:35:41 -05:00
Matthew Trescott 4c44c32a62 Allow db username/password setting in conf.d 2018-03-06 19:23:01 -05:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
Matthew Trescott 7a9350c44f Quick fix for mistake 2018-03-05 20:24:40 -05:00
Matthew Trescott 6194977697 Revamp postinst to also support MariaDB and use systemd to check service status, not /etc/init.d. 2018-03-05 19:38:42 -05:00
Matthew Trescott 17c5028312 Don't install init.d script
Despite not being specified in the --with parameter to dh, dh_installinit still seems to be run. Since most distros use systemd now, it seems like a bad idea to install services to /etc/init.d.
2018-03-05 19:17:11 -05:00
Matthew Trescott c750db91b5 Make sure a2enmod is available before calling it in postinst
The user may be using zm with e.g. nginx since apache is not a dependency.
2018-03-05 19:11:53 -05:00
Matthew Trescott 49a2065f34 Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL 2018-03-05 19:06:38 -05:00
Matthew Trescott d13335358f Copy ubuntu1604 to ubuntu1804 2018-03-05 18:39:29 -05:00
Andrew Bauer ab11e9ec38
Update zoneminder.spec 2018-02-23 11:48:35 -06: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 7074681e60 Need drop permissions 2018-01-29 11:44:29 -05:00
Isaac Connor 525749c11a Need drop permissions 2018-01-29 11:44:03 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Isaac Connor 2427a5bf63 sync up .service file to match 1604. 2018-01-08 16:13:11 -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
Andrew Bauer bc096bcc3d
make zoneminder rpm depend on zip package 2017-12-14 14:14:31 -06: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 00e963eba4 remove the dependency on boost 2017-11-28 07:17:26 -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