5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
5b93b77499
bump verion to 1.32.2
2018-10-13 13:36:15 -05:00
5c6cf88d93
bump version to 1.32.1
2018-10-02 07:37:55 -05:00
dbafffecb8
remove extra \
2018-09-26 16:20:08 -04:00
97e06bb0fd
rpm - update README's
2018-09-24 18:23:40 -05:00
7314926718
Detect mysql when mysql is run by sysv init scripts
2018-09-23 16:53:50 -04:00
4b2d4d3871
fix rpm specfile changelog
2018-09-12 12:44:36 -05:00
014202c41e
bump rpm specfile to 1.32.0
2018-09-12 07:08:58 -05:00
af32d59aa1
add libhuman-bytes-perl and libfile-slurp-file
2018-09-05 10:18:09 -04:00
36322f9129
rpm - use _pkgdocdir instead of _docdir
2018-09-01 12:15:08 -05:00
86f043633a
typo
2018-09-01 12:04:48 -05:00
563e673bee
rpm - rename README.xxx to README for all builds
2018-09-01 11:53:56 -05:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
029c6401af
add libjson-maybexs-perl as a debian package dependency
2018-08-31 09:34:54 -05:00
18c88be550
bump rpm specfile to 1.31.47
2018-08-31 07:59:51 -05:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
63153f05be
bump version in rpm specfile
2018-07-31 12:25:00 -05:00
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
a6b44d2ab5
remove jscalendar from rpm builds
2018-07-11 10:06:45 -05:00
14b83ac36b
Update zoneminder.spec
2018-07-03 16:10:06 -05:00
61fff1cd40
Update zoneminder.spec
2018-07-03 16:08:09 -05:00
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05:00
27b81bf463
rpm packaging - fedora requires php-json
2018-06-25 12:24:34 -05:00
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
2028012d39
Update README.Redhat7
2018-06-14 13:42:07 -05:00
8559dce350
rpm readme - mention changes to apache config file
2018-06-01 08:51:53 -05:00
00ace16b61
bump zoneminder rpm specfile
2018-05-31 13:54:33 -05:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
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
1907b18ac2
fix libnumber-bytes-human => libnumber-bytes-human-perl
2018-04-25 12:36:18 -04:00
600b66e27c
Update zoneminder.spec
2018-04-23 07:41:36 -05:00
02f8493b39
rpm packaging - remove support for sysvinit aka el6
2018-04-22 07:25:06 -05:00
85ba525496
rpm spec file - use %{_sourcedir} macro
2018-04-19 20:41:11 -05:00
9f74efd18a
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2018-04-19 18:41:16 -05:00
411a831338
rpm packaging - mention the firewall in the README's
2018-04-19 18:40:05 -05:00
2d2c0df8f1
rpm specfile - bump version
2018-04-19 15:39:08 -05:00
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05:00
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
8eb4195cb7
rpm specfile - update git submodules
2018-04-18 15:00:55 -05:00
8c0ad8d1f3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-17 22:57:44 -04:00
456b1b59df
rpm specfile - bump crud to 3.1.0
2018-04-17 20:27:28 -05:00
48d5fa00d4
remove libsys-cpuload-perl as a dependency
2018-04-17 21:10:55 -04:00
3a80c60d2e
rpm spefile changes - account for new files
2018-04-17 15:13:38 -05:00
08447de7ca
bump rpm specfile version
2018-04-17 14:53:55 -05:00
279e437545
Put back zmupdate and do more output
2018-04-14 23:07:33 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
e28ecf8e28
add libfile-slurp-perl as a dependency
2018-04-05 10:00:14 -04:00
4d6e5d0ab6
Add libnumber-bytes-human-perl as a dependency
2018-03-28 08:21:17 -07:00
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
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
4bb26519f6
allow errors, and add a missing fi
2018-03-16 11:59:29 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
a73a7b438c
whitespace to google code style specs. 2 spaces
2018-03-14 10:44:43 -04:00
00ab9b4c03
merge proposed changes in ubuntu1804 folder -> ubuntu1604 folder instead
2018-03-13 09:28:11 -05:00
ee146acf07
Remove obsolete symlink handling, update README.Debian
2018-03-06 20:35:41 -05:00
4c44c32a62
Allow db username/password setting in conf.d
2018-03-06 19:23:01 -05:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
7a9350c44f
Quick fix for mistake
2018-03-05 20:24:40 -05:00
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
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
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
49a2065f34
Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL
2018-03-05 19:06:38 -05:00
d13335358f
Copy ubuntu1604 to ubuntu1804
2018-03-05 18:39:29 -05:00
ab11e9ec38
Update zoneminder.spec
2018-02-23 11:48:35 -06:00
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
a888dac834
source files in /etc/zm/conf.d as well
2018-02-23 09:30:47 -05:00
c7aa45c4ce
libmysqlclient-dev debian package name changes
2018-02-19 20:21:21 -06:00
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
7074681e60
Need drop permissions
2018-01-29 11:44:29 -05:00
525749c11a
Need drop permissions
2018-01-29 11:44:03 -05:00
9a15328894
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_event.cpp
2018-01-26 13:02:16 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
c3ab7d5269
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_packetqueue.cpp
src/zma.cpp
2018-01-10 14:24:46 -05:00
2427a5bf63
sync up .service file to match 1604.
2018-01-08 16:13:11 -05:00
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
36ef0f5011
Merge branch 'storageareas' into zma_to_thread
2018-01-05 10:06:18 -05:00
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
bc096bcc3d
make zoneminder rpm depend on zip package
2017-12-14 14:14:31 -06:00
49908c11da
Merge branch 'storageareas' into zma_to_thread
2017-12-11 13:51:32 -05:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
0d9f330356
call zmcamtool during postinst ( #2021 )
2017-12-10 14:14:39 -05:00
90820ab92a
Merge branch 'storageareas' into zma_to_thread
2017-12-07 10:37:04 -05:00
bbe75762e7
remove boost
2017-12-07 09:40:00 -05:00
004a41b122
remove boost dependency.
2017-12-04 22:59:50 -05:00
5deb69207b
Merge branch 'storageareas' into zma_to_thread
2017-12-04 22:11:46 -05:00
00e963eba4
remove the dependency on boost
2017-11-28 07:17:26 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
1392c1dfc2
put back missing test for if db is local
2017-11-22 12:36:04 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
c70a9f665a
Merge branch 'storageareas' into zma_to_thread
2017-11-20 12:08:16 -05:00
dae2a6ae0a
fixup the .postinst file which got some duplicate lines
2017-11-20 11:56:05 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
7f3d112eb6
Merge branch 'tesla' into zma_to_thread
2017-11-16 12:07:25 -08:00
2570869aa0
bring back libvlc
2017-11-08 11:18:54 -05:00
b6548ba137
put curl back, we use it's decoding function for urls
2017-11-07 15:54:13 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
92917809b8
add creating /usr/share/zoneminder/www/cache
2017-11-01 12:49:38 -07:00
fc3934c8bb
kill off curl and libvlc
2017-10-25 13:20:18 -07:00
ca17d9dba4
change the systemd zoneminder.server to always restart zoneminder with a 10 second wait
2017-10-24 16:24:23 -07:00
199f90868a
add libsys-cpuload-perl as a dependency
2017-10-24 15:17:09 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
7b1142bee6
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-12 11:03:16 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
a8cf384be9
rpm spcfile change
...
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
7520f4ddb5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-26 10:39:28 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
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
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
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
4cf28267e3
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-14 12:30:10 -04:00
2002e863a9
Update zoneminder.service.in
2017-07-14 10:26:41 -05:00
1822510909
rpm packaging - consolidate zoneminder apache config file
2017-07-14 10:15:12 -05:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
99bb12dcc9
Update zoneminder.spec
...
changes from rpmfusion feedback
2017-07-14 08:33:08 -05:00
c294e25dbc
rpm packaging - migrate cakephp htaccess parms into main apache config
2017-07-14 07:23:35 -05:00
0048908071
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-13 11:18:28 -04:00
0df6ac2895
Merge branch 'master' into storageareas
2017-07-13 11:04:51 -04:00
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
cfcf7363ea
Don't test the symlinks anymore
2017-07-11 11:18:47 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
9be0e43618
Update README.Redhat7
2017-06-30 07:36:22 -05:00
69509689e0
debian stretch prefers libmariadbclient-dev and libgcrypt11-dev
2017-06-29 08:41:18 -04:00
323cd3540d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-28 11:58:23 -04:00
a656f4a6cd
Update zoneminder.conf.in
...
rpm specfile - make el6 script alias match el7 & f25
2017-06-28 10:04:28 -05:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
043b382bdd
include conf.d folder contents in debian packaging ( #1934 )
2017-06-26 14:44:33 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5ee230a141
always restart zoneminder on upgrade, not just when doing a db update
2017-06-21 17:20:50 -04:00
c33b179a59
:Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-21 17:18:49 -04:00
36683d15d2
Update zoneminder.spec
...
bump zm version in rpm specfile
2017-06-20 11:41:53 -05:00
2e60864e99
always stop and start zm on upgrade, not just if doing a db update
2017-06-20 09:44:18 -04:00
f78e720db3
add /etc/zm and /etc/zm/conf.d to install dirs
2017-06-20 09:41:35 -04:00
42a022d15b
always stop and start zoneminder on upgrade
2017-06-20 09:41:02 -04:00
db68d3e0a2
use restart instead of start
2017-06-19 13:57:00 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
734f099b4a
remove content from changelog
2017-06-15 12:15:15 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
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
617cdd5fd3
revert wip config backup
2017-06-09 15:28:01 -04:00
62429a55a8
why did git decide to delete these synlinks???
2017-06-09 12:58:15 -05:00
07d9d35e39
minimize Travis log output
2017-06-09 12:52:00 -05:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
f67584ebf9
remove references to incomplete icon work
2017-06-08 08:39:49 -04:00
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
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
44eba78e40
put back empty files
2017-06-02 20:42:55 -04:00
Isaac Connor
Andy Bauer
Andrew Bauer
Isaac Connor
Andrew Bauer
Matt N
Isaac Connor
Matthew Trescott
Isaac Connor
APHW2 MFGENG
Isaac Connor