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
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
Isaac Connor
Isaac Connor
APHW2 MFGENG
Isaac Connor
Andrew Bauer
Isaac Connor
Andrew Bauer