summaryrefslogtreecommitdiffstats
path: root/doc/man
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-11-04 09:57:08 -0600
committerSol Jerome <sol.jerome@gmail.com>2014-11-04 10:20:37 -0600
commit257eb0c174ef2fdaa2015975c5919979afa8da90 (patch)
tree51eabc1e3abcb5fdc07e350236d0469ce01e239d /doc/man
parent84ba7561d9450d05b0dd99b69c16437b29100704 (diff)
downloadbcfg2-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/man')
-rw-r--r--doc/man/bcfg2.conf.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 6faf48a1a..f55540968 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -736,9 +736,8 @@ control the database connection of the server.
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.
+ Various options for the database connection. The value expected
+ is the literal value of the django OPTIONS setting.
Reporting options
-----------------