summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-06-18 20:53:05 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-06-28 14:28:46 +0200
commit58f4b311bfa9f192c9d4d4a418e9f0db5bce1897 (patch)
treef3ee4613351bd3186380436834b8a256cc5c77a0 /doc
parentb9022e96e1353dab0843e6341239469dec773b1f (diff)
downloadbcfg2-58f4b311bfa9f192c9d4d4a418e9f0db5bce1897.tar.gz
bcfg2-58f4b311bfa9f192c9d4d4a418e9f0db5bce1897.tar.bz2
bcfg2-58f4b311bfa9f192c9d4d4a418e9f0db5bce1897.zip
Options: add database.options
With the options setting in the database section of the config file various database options for the django database could be set (like ssl mode for postgres). For more information, consult your django databse backend module's documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/man/bcfg2.conf.txt5
-rw-r--r--doc/server/database.txt6
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 3a0217aef..12f66f64f 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -729,6 +729,11 @@ control the database connection of the server.
port
Port for database connections. Not used for sqlite3.
+ options
+ Various options for the database connection. The value is
+ expected as multiple key=value pairs, separated with commas.
+ The concrete value depends on the database engine.
+
Reporting options
-----------------
diff --git a/doc/server/database.txt b/doc/server/database.txt
index b0ec7b571..3c8970f68 100644
--- a/doc/server/database.txt
+++ b/doc/server/database.txt
@@ -49,6 +49,12 @@ of ``/etc/bcfg2.conf``.
+-------------+------------------------------------------------------------+-------------------------------+
| port | The port to connect to | None |
+-------------+------------------------------------------------------------+-------------------------------+
+| options | Extra parameters to use when connecting to the database. | None |
+| | Available parameters vary depending on your database | |
+| | backend. The parameters are supplied as comma separated | |
+| | key=value pairs. | |
++-------------+------------------------------------------------------------+-------------------------------+
+
Database Schema Sync
====================