Commit Graph

317 Commits

Author SHA1 Message Date
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
Andrew Bauer 8ea4bdca1d explicity set index.php as the only directoryindex 2017-01-04 10:45:36 -06:00
Andy Bauer 7e7ef46420 rpm packaging - remove rundir from tmpfiles.d 2017-01-03 16:42:12 -06:00
Andy Bauer b4f537c5d3 rpm build tweaks based on rpmfusion feedback 2017-01-03 13:12:12 -06:00
Andrew Bauer 3042b39672 Update zoneminder.spec
rpmspecfile don't glob zoneminder's binaries
2017-01-02 11:41:14 -06:00
Andy Bauer c594ad8be7 rpmspec - remove quotes from pidfile path 2017-01-02 10:37:23 -06:00
klemens 0d549f1db3 spelling fixes 2016-12-29 10:31:05 +01:00
Andrew Bauer 76db2e811d more rpm specfile changes 2016-12-28 09:27:30 -06:00
Andrew Bauer ea0cfad37c update rpm specfile 2016-12-27 09:06:50 -06:00
Andrew Bauer 56277bce09 minor rpm specfile changes 2016-12-26 10:07:38 -06:00
Andrew Bauer 0d1dbf1745 fix rpm specfile versioning in changelog 2016-12-26 09:31:11 -06:00
Andrew Bauer 0dd6f4916e rpm specfile - move tmpfile config under /usr/lib 2016-12-26 08:31:21 -06:00
Andrew Bauer eb0b85ec13 changes based on feedback from rpmlint 2016-12-23 14:02:39 -06:00
Andrew Bauer 3d15ac315b Update CMakeLists.txt
minor whitespace change
2016-12-23 13:11:06 -06:00
Andrew Bauer 1b81d790b2 rpm specfile consolidation 2016-12-23 13:06:44 -06:00
Andrew Bauer 68cd4c2ce5 Update zoneminder.el7.spec
minor specfile change
2016-12-15 08:28:37 -06:00
Andy Bauer c2b1638a3e rpm changes - set TZ var in systemd service file 2016-11-22 12:43:56 -06:00
Andrew Bauer 004b651d61 RPM specfile config change
use make macros, rather than hard coded values
2016-07-31 15:06:39 -05:00
Andrew Bauer 3c6692d0d5 RPM specfile config change
fix logrotate script
2016-07-31 07:29:37 -05:00
Andy Bauer 980d3f6e7f rpm housecleaning, change the way jscalendar is installed 2016-07-03 11:34:35 -05:00
Andy Bauer 58e1a9ac4a rpm README changes 2016-06-01 07:30:41 -05:00
Andy Bauer dafdf1a289 rpm specfile changes 2016-04-08 19:22:27 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Jon Burgess 06e04127d6 Fix spelling in other README files as well 2016-03-18 23:27:43 +00:00
Jon Burgess 94057a94ff Fix spelling of 'environment' 2016-03-18 22:42:34 +00:00
Andrew Bauer de85e18829 rpm specfile changes for 1.30.0 2016-03-03 08:33:49 -06:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake.
Conflicts:
	distros/debian8/control
2016-02-26 22:41:27 +11:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Andy Bauer 5a8989b168 Minor RPM packaging changes 2016-02-02 11:47:55 -06:00
Andy Bauer a93f78b7e6 Bump rpm specfiles to 1.29.0 2016-01-02 10:35:52 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00
Andy Bauer b74abe88c9 minor centos 7 specfile change 2015-10-03 17:07:22 -05:00
Andrew Bauer e8c4adbcca Use make macros inside Fedora config files rather than hardcode 2015-10-03 12:54:18 -05:00
Andrew Bauer 03172af921 link to cambozola pacakge, rather than download during build 2015-09-14 13:51:48 -05:00
Andrew Bauer c8fecee68b Update CMakeLists.txt
nbtelecom was returning http 403. switching to skylineservers. In the future, I will add jscalendar packages to zmreop as that is better practice.
2015-09-12 18:03:20 -05:00
Andrew Bauer 0ff14008b3 Update zoneminder.el6.conf.in
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
2015-09-12 17:49:03 -05:00
Andrew Bauer ebb6e7158a rpm packaging changes for centos 6 2015-09-08 18:16:19 -05:00
Andrew Bauer 427c71f5e8 Update README.Centos7 2015-09-07 16:54:13 -05:00
Andrew Bauer 41cfadbcb1 Update zoneminder.el7.spec
typo
2015-09-07 16:14:58 -05:00
Andrew Bauer dc9a5b13fe redhat rpm packaging modifications 2015-09-07 15:50:42 -05:00
Andy Bauer 9320efdd45 rpm specfile - modify symlinks 2015-08-29 18:04:26 -05:00
Andy Bauer 4ddeddeb32 rpm specfile - correct typo 2015-08-29 17:28:06 -05:00
Andy Bauer 4915b7fc72 rpm spec file - create cakephp tmp folder symlink 2015-08-29 16:52:16 -05:00
Andy Bauer d9c3061b52 Add reference to mysql Create permission in rpm README's 2015-08-29 14:01:45 -05:00
Andrew Bauer ef8830b373 Update zoneminder.el6.spec
rpm specfile - update location of perl packlist
2015-08-29 11:12:55 -05:00
Andrew Bauer b69fd1e86d configure apache to follow symlinks so it find nph-zms 2015-08-13 20:23:52 -05:00
Andrew Bauer eb5bb641d6 rpm packaging - require php-gd 2015-07-16 12:15:24 -05:00
Isaac Connor 58448adb51 Merge pull request #896 from knnniggett/pod2man
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
Bill McGonigle e3727af243 softlayer-dal appears to defunct as a sourceforge mirror. Get jscalendar from nbtelcom instead. 2015-06-24 01:32:53 -04:00
Andrew Bauer d03469125a Add perl-podlators build dependency to redhat distros 2015-06-20 18:07:29 -05:00
Andrew Bauer e127228233 Update zoneminder.el7.spec
some documentation was not being packaged and neither was the selinux policy file
2015-05-07 18:13:33 -05:00
Andrew Bauer cbbe40ea1c Update zoneminder.el7.spec
Recent perl changes place the .packlist file under a different folder on CentOS 7
2015-05-07 17:56:04 -05:00
Isaac Connor 1668949f18 Merge pull request #792 from knnniggett/perl
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
Isaac Connor 411b518b14 Merge pull request #774 from knnniggett/tmpfiles
Use tmpfiles.d to manage tmpdir and sockdir
2015-04-10 13:42:28 -04:00
Andrew Bauer 0cf82a0b71 Allow user to override perl installation. Replace old perl cmake vars with new. 2015-04-10 12:09:01 -05:00
Andrew Bauer a3637b9eed Add libv4l-devel as a build req for el7, f20, & f21 2015-04-03 17:41:46 -05:00
Andrew Bauer c0af30bdf1 fix permissions on config file 2015-03-31 20:45:12 -05:00
Andrew Bauer 7802089b82 Use tmpfiles.d to manage tmpdir and sockdir 2015-03-31 20:30:27 -05:00
Andrew Bauer 111e75e8e9 add psmisc pacakge requirement to rpm specfiles 2015-02-23 08:09:48 -06:00
Andrew Bauer 397bc57692 Update zoneminder.el6.spec 2015-02-23 07:18:32 -06:00
Andrew Bauer 7d747b72d7 bump version for el6 and f20 specfiles 2015-02-23 07:12:57 -06:00
Andrew Bauer 568fea61fa Merge pull request #704 from clipo1979/master
Make el6 and el7 build process a little more automated
2015-02-19 19:18:26 -06:00
Andy Bauer 9f3ff787d1 Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	distros/redhat/archive/zoneminder.el6.spec
	distros/redhat/zoneminder.el6.spec
	web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
Andrew Bauer e3351441c7 fix cmake error, rename init script to zoneminder, modify el6 target distro 2015-02-15 15:59:58 -06:00
clipo1979 18abb3761d Update CMakeLists.txt 2015-02-15 15:50:21 +00:00
clipo1979 e762a615d3 Rename zoneminder.el6.conf to zoneminder.el6.conf.in 2015-02-15 15:48:40 +00:00
clipo1979 c6f256fef4 Rename zoneminder.el6.logrotate to zoneminder.el6.logrotate.in 2015-02-15 15:48:14 +00:00
clipo1979 aa00de486b Rename zoneminder.el7.logrotate to zoneminder.el7.logrotate.in 2015-02-15 15:47:42 +00:00
clipo1979 200f48da34 Rename zoneminder.tmpfiles to zoneminder.tmpfiles.in 2015-02-15 15:46:00 +00:00
clipo1979 4fc4789b08 Update zoneminder.el6.conf 2015-02-15 14:23:28 +00:00
clipo1979 813de8540f Update zoneminder.el6.logrotate 2015-02-15 14:21:16 +00:00
clipo1979 160503df14 Update zoneminder.el7.logrotate 2015-02-15 14:20:23 +00:00
clipo1979 6b8ce2e0d4 Rename zoneminder.in to zm.in 2015-02-15 14:06:54 +00:00
clipo1979 e80702bb22 Update CMakeLists.txt 2015-02-15 14:03:06 +00:00
clipo1979 5f96882ec7 Update CMakeLists.txt 2015-02-15 14:00:34 +00:00
clipo1979 39c5d3ad06 Update zoneminder.tmpfiles 2015-02-15 13:48:46 +00:00
clipo1979 308a8b9df3 Update CMakeLists.txt 2015-02-15 13:34:17 +00:00
clipo1979 12964f5635 Update CMakeLists.txt 2015-02-15 11:44:46 +00:00
clipo1979 3e03745603 Rename zoneminder.el7.conf to zoneminder.el7.conf.in 2015-02-15 11:43:10 +00:00