summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/database
diff options
context:
space:
mode:
authorTim Nolte <noltet@sekisui-spi.com>2015-06-08 16:40:26 +0200
committerTim Nolte <noltet@sekisui-spi.com>2015-06-08 16:40:26 +0200
commitc09ab9d2b31a6c1d60a8db3970dd56feceee9415 (patch)
tree9ced6531bdf95c5f42c75760680b785620f396b5 /user_guide_src/source/database
parenta0f1872e4978304a3b096ce90ee539c5e481b4f2 (diff)
Fixed missing MySQLi driver parameter DOCBLOCK descriptions. Updated database configuration documentation to include a list of the new MySQLi driver parameters.
Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
Diffstat (limited to 'user_guide_src/source/database')
-rw-r--r--user_guide_src/source/database/configuration.rst9
1 files changed, 8 insertions, 1 deletions
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index d21c79e44..1d10bc1a6 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -186,10 +186,17 @@ Explanation of Values:
::
$db['default']['port'] = 5432;
+
+**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)
====================== ==================================================================================================
.. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
etc.) not all values will be needed. For example, when using SQLite you
will not need to supply a username or password, and the database name
will be the path to your database file. The information above assumes
- you are using MySQL. \ No newline at end of file
+ you are using MySQL.