diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-11-04 09:57:08 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-11-04 10:20:37 -0600 |
| commit | 257eb0c174ef2fdaa2015975c5919979afa8da90 (patch) | |
| tree | 51eabc1e3abcb5fdc07e350236d0469ce01e239d /doc/server/database.txt | |
| parent | 84ba7561d9450d05b0dd99b69c16437b29100704 (diff) | |
| download | bcfg2-257eb0c174ef2fdaa2015975c5919979afa8da90.tar.gz bcfg2-257eb0c174ef2fdaa2015975c5919979afa8da90.tar.bz2 bcfg2-257eb0c174ef2fdaa2015975c5919979afa8da90.zip | |
Options.py: Fix database OPTIONS parsing
Instead of parsing key/value pairs from bcfg2.conf, this allows the
setting of the literal value which is then passed through to django as
the value of the OPTIONS setting.
This change allows for setting arbitrary options since some settings
require nested dictionaries, etc.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'doc/server/database.txt')
| -rw-r--r-- | doc/server/database.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/server/database.txt b/doc/server/database.txt index 3c8970f68..15c66754f 100644 --- a/doc/server/database.txt +++ b/doc/server/database.txt @@ -51,8 +51,8 @@ of ``/etc/bcfg2.conf``. +-------------+------------------------------------------------------------+-------------------------------+ | 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. | | +| | backend. The parameters are supplied as the value of the | | +| | django OPTIONS setting. | | +-------------+------------------------------------------------------------+-------------------------------+ |