diff options
author | Tim Nolte <noltet@sekisui-spi.com> | 2015-06-08 17:02:56 +0200 |
---|---|---|
committer | Tim Nolte <noltet@sekisui-spi.com> | 2015-06-08 17:02:56 +0200 |
commit | 2ac4177b4b6afc63d594523416c3991d23dddf20 (patch) | |
tree | bd20e4d7f5f437ff1e1c19a3e459544d58eb21b5 /user_guide_src/source | |
parent | c09ab9d2b31a6c1d60a8db3970dd56feceee9415 (diff) |
Added new MySQLi parameters/info to default database config file. Fixed missing new MySQLi parameters from database configuration documentation examples.
Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
Diffstat (limited to 'user_guide_src/source')
-rw-r--r-- | user_guide_src/source/database/configuration.rst | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 1d10bc1a6..510037dba 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -30,6 +30,12 @@ prototype:: 'encrypt' => FALSE, 'compress' => FALSE, 'stricton' => FALSE, + 'db_options' => array(), + 'ssl_key' => '', + 'ssl_cert' => '', + 'ssl_ca' => '', + 'ssl_capath' => '', + 'ssl_cipher' => '', 'failover' => array() ); @@ -71,7 +77,13 @@ These failovers can be specified by setting the failover for a connection like t 'swap_pre' => '', 'encrypt' => FALSE, 'compress' => FALSE, - 'stricton' => FALSE + 'stricton' => FALSE, + 'db_options' => array(), + 'ssl_key' => '', + 'ssl_cert' => '', + 'ssl_ca' => '', + 'ssl_capath' => '', + 'ssl_cipher' => '' ), array( 'hostname' => 'localhost2', @@ -89,7 +101,13 @@ These failovers can be specified by setting the failover for a connection like t 'swap_pre' => '', 'encrypt' => FALSE, 'compress' => FALSE, - 'stricton' => FALSE + 'stricton' => FALSE, + 'db_options' => array(), + 'ssl_key' => '', + 'ssl_cert' => '', + 'ssl_ca' => '', + 'ssl_capath' => '', + 'ssl_cipher' => '' ) ); @@ -120,6 +138,12 @@ example, to set up a "test" environment you would do this:: 'compress' => FALSE, 'encrypt' => FALSE, 'stricton' => FALSE, + 'db_options' => array(), + 'ssl_key' => '', + 'ssl_cert' => '', + 'ssl_ca' => '', + 'ssl_capath' => '', + 'ssl_cipher' => '', 'failover' => array() ); |