summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Nolte <noltet@sekisui-spi.com>2015-06-08 17:02:56 +0200
committerTim Nolte <noltet@sekisui-spi.com>2015-06-08 17:02:56 +0200
commit2ac4177b4b6afc63d594523416c3991d23dddf20 (patch)
treebd20e4d7f5f437ff1e1c19a3e459544d58eb21b5
parentc09ab9d2b31a6c1d60a8db3970dd56feceee9415 (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>
-rw-r--r--application/config/database.php12
-rw-r--r--user_guide_src/source/database/configuration.rst28
2 files changed, 38 insertions, 2 deletions
diff --git a/application/config/database.php b/application/config/database.php
index 925b3e504..36ae83dda 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -43,6 +43,12 @@ defined('BASEPATH') OR exit('No direct script access allowed');
| ['compress'] Whether or not to use client compression (MySQL only)
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
| - good for ensuring strict SQL while developing
+| ['db_options'] Used to set various database connections options and values. (MySQLi only)
+| ['ssl_key'] The path name to the key file. (MySQLi only)
+| ['ssl_cert'] The path name to the certificate file. (MySQLi only)
+| ['ssl_ca'] The path name to the certificate authority file. (MySQLi only)
+| ['ssl_capath'] The pathname to a directory that contains trusted SSL CA certificates in PEM format. (MySQLi only)
+| ['ssl_cipher'] A list of allowable ciphers to use for SSL encryption. (MySQLi only)
| ['failover'] array - A array with 0 or more data for connections if the main should fail.
| ['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
| NOTE: Disabling this will also effectively disable both
@@ -80,6 +86,12 @@ $db['default'] = array(
'encrypt' => FALSE,
'compress' => FALSE,
'stricton' => FALSE,
+ 'db_options' => array(),
+ 'ssl_key' => '',
+ 'ssl_cert' => '',
+ 'ssl_ca' => '',
+ 'ssl_capath' => '',
+ 'ssl_cipher' => '',
'failover' => array(),
'save_queries' => TRUE
);
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()
);