diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-03-18 18:26:27 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-03-18 18:26:27 -0500 |
| commit | aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f (patch) | |
| tree | f83eaeea83f7710fac6cbed11b786331647644b0 /doc/man | |
| parent | e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2 (diff) | |
| parent | 4f6ba35fd86ae748d77557936e39db162cc282e3 (diff) | |
| download | bcfg2-aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f.tar.gz bcfg2-aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f.tar.bz2 bcfg2-aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f.zip | |
Merge branch 'maint'
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/bcfg2.conf.txt | 12 | ||||
| -rw-r--r-- | doc/man/bcfg2.txt | 9 |
2 files changed, 17 insertions, 4 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt index d8f2bc3df..3a0217aef 100644 --- a/doc/man/bcfg2.conf.txt +++ b/doc/man/bcfg2.conf.txt @@ -729,11 +729,21 @@ control the database connection of the server. port Port for database connections. Not used for sqlite3. +Reporting options +----------------- + + config + Specifies the location of the reporting configuration (default + is /etc/bcfg2-web.conf. + time_zone - Specify a time zone other than that used on the system. (Note + Specifies a time zone other than that used on the system. (Note that this will cause the Bcfg2 server to log messages in this time zone as well). + web_debug + Turn on Django debugging. + See Also -------- diff --git a/doc/man/bcfg2.txt b/doc/man/bcfg2.txt index 6a77a4a3c..6df4f9b4f 100644 --- a/doc/man/bcfg2.txt +++ b/doc/man/bcfg2.txt @@ -88,10 +88,13 @@ Options the constraints of correctness, and thus should only be used in safe conditions. -r mode Cause bcfg2 to remove extra configuration elements - it detects. Mode is one of "all", "Services", or - "Packages". "all" removes all entries. Likewise, - "Services" and "Packages" remove only the extra + it detects. Mode is one of "all", "Services", + "Packages", or "Users". "all" removes all extra entries. + "Services", "Packages", and "Users" remove only the extra configuration elements of the respective type. + ("Services" actually just disables extra services, + since they can't be removed, and "Users" removes + extra POSIXUser and POSIXUser entries.) -s servicemode Set bcfg2 interaction level for services. Default behavior is to modify all services affected by reconfiguration. "build" mode attempts to stop all |