b255414bbb
Merge branch 'storageareas' into remove_ffmpeg_thread
2017-08-14 11:15:25 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
fdd0e8dc1b
fix spacing
2017-07-05 13:08:31 -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
9669fede18
fix merge by putting back my dbRow object
2017-06-09 10:18:15 -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
0a8017b780
whitespace/google code style
2017-05-19 12:24:19 -04:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
d12b9dc16d
fix typo. needs }
2016-05-24 09:24:18 -05:00
6e82f2c9a9
add messages back with debug 3
2016-05-24 08:50:09 -05:00
bc163b33fc
move multiserver message to once during startup only
2016-05-23 20:06:29 -05:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
e8c38dd016
demoted to debug due to lots of logs
2016-02-11 15:12:21 -05:00
3a0b28f168
Add Debug/Info lines reporting multi-server status
2016-01-26 20:53:34 -05:00
633a6e2df9
use zmDbFetchOne more
2015-07-16 16:53:30 -04:00
60410c98d6
use new db functions in zm_config.cpp
2015-07-16 16:44:09 -04:00
50b333fb28
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:04:56 -04:00
3481368574
given SERVER_NAME populate SERVER_ID and vice versa
2015-07-15 16:44:16 -04:00
3d9a0f4729
Fix memory leaks in zmLoadConfig
2014-11-15 13:32:43 +01:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
46d777398e
Updated to use fixed buffer sizes rather than relying on o/s defined.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:22:35 +00:00
e6041e24a7
Uppdated copyright headers
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:33:23 +00:00
fed2b53003
Added missing staticConfig definition
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2605 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 17:12:53 +00:00
f66aa5e10e
Updated static config to use strings
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2603 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 17:08:50 +00:00
ee44d4b274
Updated debug format
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:43:47 +00:00
799ee78675
Bug 471 - Compiler warnings, sorted out types and general format tidying
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2357 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-13 13:36:12 +00:00
235dde1a80
Updated copyright statement.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1829 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 10:56:30 +00:00
034661e84f
Changed comments to refer to zmupdate and not zmconfig.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1800 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:35:09 +00:00
a35a06dc1d
Bug 232 - Revamped build and install
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1678 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 10:13:59 +00:00
18c4a9d2f1
Fixed typo.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1651 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-02 10:18:59 +00:00
bf267d4ca7
Bug 207 - Changed warnings to errors and added helpful text.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1647 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-02 10:15:40 +00:00
65f7cf09b5
Bug 216 - Zone polygons
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1630 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 17:51:06 +00:00
c8586ceba2
Bug 129 - Added additional debug configuration
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1528 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 11:47:03 +00:00
f089f28bd4
Added simplified direct config interface.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1406 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-16 09:27:06 +00:00
264c23d687
Updated copyright statement
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1360 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-02-24 14:40:14 +00:00
00cce5a800
Removed dependency on RegExp.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1238 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-26 20:51:35 +00:00
dc3b3691a0
Revamped debug initialisation and config loading.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1208 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-15 17:45:51 +00:00
5ed307f0c5
Modified formatting slightly.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1207 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-15 17:27:03 +00:00
2ba1ee4eb8
Removed secondary DB user.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1171 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 17:01:25 +00:00
72da78e98a
Added zm.conf feature.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1170 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 16:46:48 +00:00
b508b2a5ce
Changed strcpy to strncpy, sprintf to snprintf and query parameter checks to avoid vulnerabilities.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1017 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-04-19 16:02:17 +00:00
d4c6ff1db8
Changed base of strtol.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@745 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-01-15 11:36:42 +00:00
0aafd9d30b
Applied Ian@zestysoft changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@744 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-01-14 21:26:47 +00:00
cae42a9a42
Added (belatedly) to CVS.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@676 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-11-05 13:50:08 +00:00
Isaac Connor
ralimi
Andrew Bauer
Isaac Connor
Andy Bauer
Andrew Bauer
Isaac Connor
arjunrc
Emmanuel Papin
stan