Commit Graph

19 Commits

Author SHA1 Message Date
Petter Reinholdtsen 5647c224d1 Make config file comment on unix socket option a bit clearer
Initially I took the comment for granted, and the 'unix_socket' string
as a magic string to tell zoneminder to use the mysql default socket.  Alas,
this do not work, as the setting really need to point to the path of the socket.
Rewrite the comment to make this more clear, and less confusing for the
future users.
2021-12-02 15:18:04 +01: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
Andrew Bauer 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
Andrew Bauer 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
Andrew Bauer 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
Joshua Ruehlig 7e3c0e42b7 Update zm.conf.in
Add possible formats for ZM_DB_HOST
2017-04-21 10:56:48 -07:00
Andy Bauer 1c9633f1bd add comment/warning for ZM_SERVER_HOST 2016-03-01 08:43:36 -06:00
Andrew Bauer 2e8935daf2 Add the ability to specify the zm configdir at build time. 2014-11-11 09:15:15 -06:00
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO
Conflicts:
	zm.conf.in
2013-11-08 11:22:09 -05:00
Kfir Itzhak 90d7ce98f1 Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for
ZM_DB_TYPE
2013-11-04 22:38:21 +02:00
Isaac Connor 0fd7d857bf put back ZM_PATH_DATA 2013-11-04 10:06:39 -05:00
Andrew Bauer 73845e0562 Re-Add ZM_PATH_DATA 2013-11-03 08:22:19 -06:00
Isaac Connor 72b80d7417 remake this branch off master instead of off mysql2PDO.
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
Isaac Connor 5eb313b896 add config lline for DB type 2013-10-16 16:08:41 -04:00
Andy Bauer 1c1a644b35 Update zm.conf.in
Update comment for ZM_PATH_BUILD. Is this needed any more?
2013-10-08 07:10:06 -05:00
Knniggett 32ee0a8976 create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db 2013-10-05 18:40:54 -05:00
stan 226e7cd380 Applied Coey mods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2057 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 09:06:30 +00:00
stan 0055ecb026 Modified ZM_PATH_UPDATE and sql script behaviour
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1938 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-23 20:24:18 +00:00
stan b7cbe133d9 Bug 232 - Revamped config and build methodology
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1676 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-16 10:12:40 +00:00