Commit Graph

296 Commits

Author SHA1 Message Date
Andrew Bauer fac9d69801 rpm - update README's 2018-11-20 15:36:34 -06:00
Andrew Bauer 71bfd50b2c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2018-11-18 12:49:26 -06:00
Andrew Bauer f867d75522 rpm pkg - set ownership of events folder 2018-11-18 12:48:41 -06:00
Andrew Bauer d1219791cc
rpm pkg - fix api support in nginx config 2018-11-18 12:30:24 -06:00
Andrew Bauer 689665cfcc rpm pkg - fgciwrap service is instantiated 2018-11-18 11:41:20 -06:00
Andrew Bauer 3b2bac0e41 rpm pkg - add missing asterisk 2018-11-18 11:31:04 -06:00
Andy Bauer ac7a03233e rpm pkg - change owership of log files 2018-11-18 11:20:47 -06:00
Andy Bauer 5e2935b81d rpm pkg - change ownership of php session files 2018-11-18 11:16:46 -06:00
Andy Bauer 05c4f586c2 rpm pkg - httpd instead of apache 2018-11-18 10:15:27 -06:00
Andrew Bauer 4144fe3292 rpm pkg - fix php-fpm config 2018-11-17 21:41:25 -06:00
Andrew Bauer abd178d421 rpm pkg - add nginx to apache group, rather than set folder perms 2018-11-17 19:46:15 -06:00
Andrew Bauer f9b61114e2
Update zoneminder.apache.tmpfiles.in 2018-11-17 15:33:52 -06:00
Andrew Bauer d3f45120f1
Update zoneminder.apache.tmpfiles.in 2018-11-17 15:25:51 -06:00
Andrew Bauer 719bdf1270 rpm subpackages - add readme's 2018-11-17 11:52:04 -06:00
Andrew Bauer f79a7e49a8 rpm subpackages - additional fixes 2018-11-17 11:32:35 -06:00
Andrew Bauer 7f7fc44b03 fix nameing of tmpfiles config 2018-11-17 11:01:12 -06:00
Andrew Bauer d06e1b075d fix filename of com.zoneminder.systemctl.rules.nginx 2018-11-17 10:47:53 -06:00
Andrew Bauer ac0e8c9b0b initial support for subpackages 2018-11-17 10:45:08 -06:00
Andrew Bauer b353b625eb rpm - configure the nginx config file in all cases 2018-11-16 10:40:39 -06:00
Andrew Bauer 8df9e4c1ee
Update zoneminder.logrotate.in 2018-11-15 20:18:56 -06:00
Andrew Bauer 9b46c92ac5 rpm pkg - add note to zm php-fpm config file 2018-11-15 09:19:26 -06:00
Andrew Bauer 2f8c0654d5 rpm pkg - fix for zm php-fpm config path 2018-11-15 08:31:04 -06:00
Andrew Bauer f2fc234880 rpm pkg - install zm php-fpm config in all cases for future nginx support 2018-11-15 08:26:54 -06:00
Andrew Bauer d3064e4402
Update zoneminder.spec 2018-11-05 07:06:34 -06:00
Andrew Bauer b8066e66ed
Update zoneminder.spec 2018-11-05 06:51:08 -06:00
Andrew Bauer 720505cbea
spelling 2018-11-04 17:14:46 -06:00
Andy Bauer 3aee902a96 update nginx support on redhat 2018-11-04 17:11:19 -06:00
Andy Bauer 5b93b77499 bump verion to 1.32.2 2018-10-13 13:36:15 -05:00
Andy Bauer 5c6cf88d93 bump version to 1.32.1 2018-10-02 07:37:55 -05:00
Andrew Bauer 97e06bb0fd rpm - update README's 2018-09-24 18:23:40 -05:00
Andrew Bauer 4b2d4d3871 fix rpm specfile changelog 2018-09-12 12:44:36 -05:00
Andrew Bauer 014202c41e bump rpm specfile to 1.32.0 2018-09-12 07:08:58 -05:00
Andrew Bauer 36322f9129 rpm - use _pkgdocdir instead of _docdir 2018-09-01 12:15:08 -05:00
Andrew Bauer 86f043633a typo 2018-09-01 12:04:48 -05:00
Andrew Bauer 563e673bee rpm - rename README.xxx to README for all builds 2018-09-01 11:53:56 -05:00
Andrew Bauer 18c88be550
bump rpm specfile to 1.31.47 2018-08-31 07:59:51 -05:00
Andrew Bauer 63153f05be
bump version in rpm specfile 2018-07-31 12:25:00 -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
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
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
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
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
Andrew Bauer 456b1b59df
rpm specfile - bump crud to 3.1.0 2018-04-17 20:27:28 -05: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
Andrew Bauer ab11e9ec38
Update zoneminder.spec 2018-02-23 11:48:35 -06:00
Andrew Bauer bc096bcc3d
make zoneminder rpm depend on zip package 2017-12-14 14:14:31 -06:00
Andrew Bauer a8cf384be9 rpm spcfile change
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05: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
Andrew Bauer d931945619 Update zoneminder.spec
we have to tell rpm what permission zmcustom.conf has to prevent the build from failing on el6
2017-07-20 17:53:06 -05:00
Andrew Bauer 4bca799d43 reorganize zm config files (#1937)
* reogranize config files

* process 01-system-paths.conf.in

* exclude .in files in install directive
2017-07-17 09:11:36 -04:00
Andrew Bauer 2002e863a9 Update zoneminder.service.in 2017-07-14 10:26:41 -05:00
Andrew Bauer 1822510909 rpm packaging - consolidate zoneminder apache config file 2017-07-14 10:15:12 -05:00
Andrew Bauer 99bb12dcc9 Update zoneminder.spec
changes from rpmfusion feedback
2017-07-14 08:33:08 -05:00
Andrew Bauer c294e25dbc rpm packaging - migrate cakephp htaccess parms into main apache config 2017-07-14 07:23:35 -05:00
Andrew Bauer 5e74fd2e53 Update zoneminder.spec
rpmspecfile change. zmsystemctl.pl is only installed on distros w/ systemd (i.e. all current distros except el6)
2017-07-12 14:23:43 -05:00
Andrew Bauer 9be0e43618 Update README.Redhat7 2017-06-30 07:36:22 -05:00
Andrew Bauer a656f4a6cd Update zoneminder.conf.in
rpm specfile - make el6 script alias match el7 & f25
2017-06-28 10:04:28 -05:00
Andrew Bauer 36683d15d2 Update zoneminder.spec
bump zm version in rpm specfile
2017-06-20 11:41:53 -05: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
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
Andrew Bauer 088bafd8e9 Update zoneminder.spec
rpm specfile change. Don't look for polkit rules on legacy sys v systems
2017-05-10 10:47:05 -05:00
Andrew Bauer 3ec90f1d0e Update zoneminder.spec
zmf was removed from the project. update rpm specfile accordingly
2017-05-10 10:05:52 -05:00
Andy Bauer 12fc011a29 1.30.4 release 2017-05-09 09:54:48 -05:00
Andrew Bauer 31b52197a2 Update zoneminder.spec
change rpm package requirements relating to php-pecl-apcu
2017-05-08 10:35:32 -05:00
Andrew Bauer fd35ac37c5 Update zoneminder.spec
fix %autosetup parameters
2017-05-08 10:18:21 -05:00
Andrew Bauer a857e68aad rpmspecfile change
add flags to %autosetup to make it patch friendly
2017-05-05 12:20:12 -05:00
Andrew Bauer 44433ab9c6 Update README.Fedora 2017-05-05 08:43:49 -05:00
Andy Bauer fd8aa62927 bump 1.30.3 release 2017-05-02 13:25:56 -05:00
Andrew Bauer cea31f205a Update zoneminder.tmpfiles.in
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
2017-04-16 20:44:41 -05:00
Andy Bauer 4240f03f4e rpm readmefile changes 2017-04-15 09:23:28 -05:00
Andrew Bauer 7e9b9944ae rpmspecfile changes to reflect recent commits 2017-04-15 08:51:59 -05:00
Andrew Bauer cd1b09d977 Update zoneminder.spec
use rpm macros
2017-03-31 20:35:24 -05:00
Andrew Bauer 716a25fc1f rpmspecfile - ensure cache folders are created during install 2017-03-31 20:17:05 -05:00
Andrew Bauer 7068efd581 rpmspecfile - modify tarball handling 2017-03-30 18:31:58 -05:00
Andrew Bauer 9a2c31d2c0 bump rpmspecfile to 1.30.2 release 2017-03-30 18:20:41 -05:00
Andrew Bauer e46f64125e Update zoneminder.tmpfiles.in
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
Andrew Bauer 91dd2105d2 rpmspecfile - use %{_sysconfdir} macro 2017-02-08 20:44:00 -06:00
Andrew Bauer bd4aea0385 rpm specfile - php requires was listed twice 2017-02-08 20:21:23 -06:00
Andrew Bauer 9c8c87f591 rpm specfile - require php-mysqli, bump to 1.30.2 2017-02-08 20:12:54 -06:00
Andy Bauer 3882b74766 rpm specfile - el6 buildrequires epel-rpm-macros 2017-01-15 16:39:38 -06:00
Andrew Bauer 418995df84 rpm specfile changes
need to put this back in to maintain compatibility with packpack
2017-01-15 09:59:17 -06:00
Andrew Bauer 06fd760a2a rpm specfile- use %{_localstatedir} macro 2017-01-09 09:07:05 -06:00
Andrew Bauer dc6b2ed114 clean up unnessary requires 2017-01-08 18:17:28 -06:00
Andrew Bauer 6b7e3a1b61 rpm specfile changes 2017-01-08 17:37:03 -06:00
Andrew Bauer 0d7e1bcbc5 add php as a dependency only when we aren't using nginx 2017-01-04 10:49:22 -06:00