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
Andrew Bauer
a6b44d2ab5
remove jscalendar from rpm builds
2018-07-11 10:06:45 -05:00
Andrew Bauer
14b83ac36b
Update zoneminder.spec
2018-07-03 16:10:06 -05:00
Andrew Bauer
61fff1cd40
Update zoneminder.spec
2018-07-03 16:08:09 -05:00
Andrew Bauer
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05:00
Andrew Bauer
27b81bf463
rpm packaging - fedora requires php-json
2018-06-25 12:24:34 -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
Andrew Bauer
2028012d39
Update README.Redhat7
2018-06-14 13:42:07 -05:00
Andrew Bauer
8559dce350
rpm readme - mention changes to apache config file
2018-06-01 08:51:53 -05:00
Andrew Bauer
00ace16b61
bump zoneminder rpm specfile
2018-05-31 13:54:33 -05:00
Isaac Connor
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
Andrew Bauer
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor
1907b18ac2
fix libnumber-bytes-human => libnumber-bytes-human-perl
2018-04-25 12:36:18 -04:00
Andrew Bauer
600b66e27c
Update zoneminder.spec
2018-04-23 07:41:36 -05:00
Andy Bauer
02f8493b39
rpm packaging - remove support for sysvinit aka el6
2018-04-22 07:25:06 -05:00
Andrew Bauer
85ba525496
rpm spec file - use %{_sourcedir} macro
2018-04-19 20:41:11 -05:00
Andy Bauer
9f74efd18a
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2018-04-19 18:41:16 -05:00
Andy Bauer
411a831338
rpm packaging - mention the firewall in the README's
2018-04-19 18:40:05 -05:00
Andrew Bauer
2d2c0df8f1
rpm specfile - bump version
2018-04-19 15:39:08 -05:00
Andy Bauer
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05: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
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