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
c353d5d17b
Update CMakeLists.txt
...
fix erroneous creation of /etc/zm/conf.d/conf.d during an out-of-source build
2017-08-14 08:45:03 -05:00
edd66dd0cf
Update redhat.rst
2017-08-11 12:41:12 -05:00
0936dc79bc
Update redhat.rst
2017-08-11 12:37:44 -05:00
4aa15702e7
Update redhat.rst
2017-08-11 12:33:39 -05:00
3a7ad58c25
Update redhat.rst
2017-08-11 08:55:57 -05:00
4187da2d5a
Update redhat.rst
2017-08-11 08:45:34 -05:00
ae8873c2cc
Update redhat.rst
2017-08-11 08:44:02 -05:00
565612b86b
Update redhat.rst
2017-08-11 07:55:29 -05:00
64cf80ccf4
Update redhat.rst
2017-08-11 07:52:25 -05:00
4941e6715c
Update redhat.rst
2017-08-11 07:49:59 -05:00
27796ab720
Update redhat.rst
2017-08-10 20:57:26 -05:00
0a5188d79f
Update redhat.rst
2017-08-10 20:55:22 -05:00
a64810fcfc
Update README.md
2017-08-10 20:34:48 -05:00
fd7ea84e81
Update README.md
...
Point users to rpmfusion for zoneminder rpm releases
2017-08-10 20:34:05 -05:00
c5c68d064e
Merge pull request #1930 from connortechnology/split_zmeventstream
...
split EventStream into it's own files
2017-08-09 20:36:17 -05:00
6562d5eb47
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-08-09 09:54:34 -04:00
928c4651a6
fix braces, spacing
2017-08-09 09:54:27 -04:00
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
1cfd657168
put back the preg_replace that strips usernames and passwords from monitor source
2017-07-26 10:22:57 -04:00
342aacd94f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:19:44 -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
1264f0601f
update to storageareas version, which changes the sql to use subqueries instead of JOINs
2017-07-14 15:55:08 -04:00
5cf2be528a
Merge pull request #1950 from connortechnology/fix_api_logs
...
fix path to logs for api
2017-07-14 13:19:12 -05:00
c98255dd75
Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
...
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
e247efcd42
Merge pull request #1951 from connortechnology/fix_api_conf_d
...
updates bootstrap.php.in to match config.php's conf.d loading
2017-07-14 12:44:44 -05:00
240a990c7f
fix writing to config
2017-07-14 12:19:43 -04:00
e203064bf7
updates bootstrap.php.in to match config.php's conf.d loading
2017-07-14 12:03:00 -04:00
13a72b7a99
fix path to logs for api
2017-07-14 11:58:15 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
2002e863a9
Update zoneminder.service.in
2017-07-14 10:26:41 -05:00
76f1d1a3aa
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-07-14 10:16:54 -05:00
1822510909
rpm packaging - consolidate zoneminder apache config file
2017-07-14 10:15:12 -05:00
801d978898
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-14 10:30:25 -04:00
a07f8961d1
add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary.
2017-07-14 10:30:12 -04:00
d5a4aaca5d
fix braces, spacing, move pod docs to bottom
2017-07-14 10:28:31 -04:00
d634d8967b
Merge ../ZoneMinder.master into fix_empty_monitor_source_column
2017-07-14 10:04:24 -04:00
d13d7e9050
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
2017-07-14 09:57:25 -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
8567ea9613
Merge pull request #1945 from connortechnology/fix_zmonvif
...
make code more robust by handling an undefined get_VideoEncoderConfig
2017-07-14 07:09:22 -05:00
3789dcb5de
Introducing Maginon Supra IPC camera Controls and script ( #1947 )
...
* Added Maginon Supra IPC to Controls
* Adding support for Maginon Supra IPC camera
2017-07-13 11:10:20 -04:00
f7a99a1106
make montagereview not load all events and frames at once, so that it doesn't use up all memory
2017-07-13 11:06:08 -04:00
9d1d2c1ce4
print the line out all at once, fixing the missing comma after fps.
2017-07-13 10:27:53 -04:00
10ea0de5a4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-13 10:26:44 -04:00
403dca78fb
break up a long line
2017-07-13 10:26:24 -04:00
a5f9c01298
fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected
2017-07-13 10:26:09 -04:00
cb88952a77
braces and spacing
2017-07-13 10:25:14 -04:00
ralimi
Andrew Bauer
Isaac Connor
Isaac Connor
Martin Goodwell