Commit Graph

28 Commits

Author SHA1 Message Date
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
ralimi 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
Isaac Connor cfbfc0dd44 Merge branch 'master' into storageareas 2017-07-21 11:04:32 -04:00
Isaac Connor efb02f3368 fix indent 2017-07-21 10:54:48 -04:00
Andrew Bauer 5cf2be528a Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
2017-07-14 13:19:12 -05:00
Isaac Connor 240a990c7f fix writing to config 2017-07-14 12:19:43 -04:00
Isaac Connor e203064bf7 updates bootstrap.php.in to match config.php's conf.d loading 2017-07-14 12:03:00 -04:00
Isaac Connor 13a72b7a99 fix path to logs for api 2017-07-14 11:58:15 -04:00
Isaac Connor 9824049c0c fix conf.d loading in api 2017-07-14 11:46:36 -04:00
Isaac Connor 84fd80b242 undo cake log path changes 2017-06-08 12:21:51 -04:00
Isaac Connor c7b52bd998 fix logging dirs 2017-05-30 13:14:43 -04:00
Joshua Ruehlig ca1e8a13fe Update database.php.default 2017-04-24 23:40:21 -07:00
Isaac Connor ab4b5e6b69 Merge pull request #1853 from knnniggett/cakecache
change cake cache engine from File -> Apc
2017-04-14 21:10:23 -04:00
Andrew Bauer 48a73f7e78 change cache engine from File -> Apc 2017-04-14 14:31:42 -05:00
Andrew Bauer 3cbd32cd41 move cake log to zoneminder log folder 2017-04-14 14:24:29 -05:00
Matthew Noorenberghe df4739826b Reduce the default API debug level 2017-02-18 23:06:53 -08:00
Pliable Pixels 92d7cad5f1 enabled utf8 2016-09-21 11:53:34 -04:00
Joshua Ruehlig e12160456b Support user defined MySQL Port/Socket in API 2016-05-09 00:24:08 -07:00
Isaac Connor ce69f24bdd use zm.conf values for database connection 2016-04-30 08:11:39 -04:00
Isaac Connor 532fb77ecb As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes 2016-04-30 08:09:56 -04:00
Andy Bauer 827eebd38c remove core.php, modify core.php.default 2015-08-29 14:53:39 -05:00
Isaac Connor 22275e661c Tell cake to use the same session id as classic ui 2015-08-21 09:03:44 -04:00
Isaac Connor 51631b84b4 cleanup generated files 2015-07-09 10:59:45 -04:00
pliablepixels 12ba217de0 Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master 2015-06-13 16:32:37 +00:00
Isaac Connor bda35ed4d6 fix bootstrap.ini substitution 2015-06-12 11:12:58 -04:00
Ubuntu dd9603f70f Merged Angular UI branch API to master 2015-06-11 02:58:58 +00:00
Kfir Itzhak afd4e451fd Add the web/api folder to cmake 2014-04-30 12:16:46 +03:00
Kyle Johnson f1f3de6d7d Moved the api to underneath the web directory 2014-04-29 20:41:04 +00:00