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
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
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -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
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
242c8fc0ab
fix options, to remove indexes
2017-05-23 15:01:22 -04:00
51946da564
add a -f so that removing the directories actually removes the contents
2017-05-23 14:44:21 -04:00
c4d7703867
Merge a new apache.conf that supports fcgid
2017-05-23 14:42:31 -04:00
48ad0b77fc
merge updates for newer releases of packages
2017-05-23 14:39:31 -04:00
b3f2b13718
Merge branch 'apache_indexes' into storageareas
2016-11-22 13:29:30 -05:00
b059ca83da
Rremove Index from options to prevent directory listings
2016-11-22 13:25:52 -05:00
e8da04df56
Merge branch 'apache_indexes' into storageareas
2016-11-22 13:09:44 -05:00
6361f14387
Rremove Index from options to prevent directory listings
2016-11-08 09:30:24 -05:00
53d3e063e8
smal re-order
2016-09-30 09:35:52 -04:00
3dfe1185ff
add ffmpeg as option to libav-tols
2016-09-13 10:11:50 -04:00
bdcc53d309
add an echo to tell us that updating is done and we are trying to start.
2016-08-12 10:04:10 -04:00
6b70ff964b
fix path in cake api cleanup rules
2016-08-10 09:06:15 -04:00
8eee25795a
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 14:02:46 +02:00
441020e8b8
fix_type
2016-09-29 10:49:40 -04:00
ce2c52c07d
allow libavdevice55 and 57
2016-09-27 16:15:24 -04:00
da5bad7ec2
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-27 15:09:14 -04:00
24e33fec7f
allow libvlccore8
2016-09-27 15:08:00 -04:00
730d7a648d
add -f to rm
2016-09-27 14:15:38 -04:00
ee93424bf9
update jpeh deps to match official debian repo
2016-09-27 12:33:50 -04:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
b36694ad8b
Merge branch 'master' into storageareas
2016-08-12 10:04:52 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
e62ea454ba
Merge branch 'master' into storageareas
2016-05-17 10:48:52 -04:00
09e4aca0be
add libdata-uuid-perl to debian/ubuntu dependencies
2016-05-17 09:26:36 -04:00
c626baae14
Merge branch 'fix_grant' into storageareas
2016-04-20 14:39:06 -04:00
02a56b811b
Don't be recursive when chowning /var/cache/zoneminder
2016-04-20 14:38:51 -04:00
3f27f4893c
Merge branch 'fix_grant' into storageareas
2016-04-15 12:55:13 -04:00
e473839704
substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults
2016-04-06 15:50:51 -04:00
6cdbcfc9e6
add back identified by
2016-04-06 13:55:18 -04:00
6199a54838
more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504
2016-04-06 13:45:46 -04:00
fb05e1baad
grant requires rights regardless of password
2016-04-06 13:01:20 -04:00
59a8b37df2
Merge branch 'master' into storageareas
2016-04-06 11:47:20 -04:00
3e5a4b6481
remove autotools builds, replace them with cmake versions
2016-04-06 08:43:20 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
0f1a530891
ciontrol files need spaces on multi-line lines
2016-04-05 09:03:37 -04:00
9647a680f6
Merge branch 'add_onvif_deps' into storageareas
2016-03-08 16:06:30 -05:00
cfbf2cced1
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:29 -05:00
98b3b92bbf
Merge branch 'add_onvif_deps' into storageareas
2016-03-07 21:54:25 -05:00
61ffae79d1
split into multiple lines and add onvif deps
2016-03-03 08:58:53 -05:00
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
16274e46bc
grant create,index to zmuser when updating
2015-11-09 12:36:26 -05:00
6b994132f1
grant create,index to zmuser when updating
2015-11-09 12:34:11 -05:00
e37cf0e218
append /www to docroot for all debian/ubuntu dists
2015-10-23 16:08:32 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Disassembler