diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/appendix/contributors.txt | 78 | ||||
| -rw-r--r-- | doc/appendix/index.txt | 1 | ||||
| -rw-r--r-- | doc/development/compat.txt | 2 | ||||
| -rw-r--r-- | doc/server/encryption.txt | 7 | ||||
| -rw-r--r-- | doc/server/plugins/generators/cfg.txt | 2 | ||||
| -rw-r--r-- | doc/server/plugins/generators/packages.txt | 18 | ||||
| -rw-r--r-- | doc/server/plugins/generators/rules.txt | 2 |
7 files changed, 21 insertions, 89 deletions
diff --git a/doc/appendix/contributors.txt b/doc/appendix/contributors.txt deleted file mode 100644 index 9f99d25be..000000000 --- a/doc/appendix/contributors.txt +++ /dev/null @@ -1,78 +0,0 @@ -.. -*- mode: rst -*- - -.. _AUTHORS: http://trac.mcs.anl.gov/projects/bcfg2/browser/AUTHORS -.. _MCS: http://www.mcs.anl.gov/ - -.. _appendix-contributors: - -============ -Contributors -============ - -.. - This is list is no longer in chronological order like the - AUTHORS file because it's easier to maintain. - Automatically sorted. - -In alphabetical order of the given name: - -- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed - plugins. -- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of - which was used in the Bcfg2 client. -- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the - verification debugging code. -- Chris St. Pierre <stpierreca@ornl.gov> (re)wrote bcfg2-lint and has - made other miscellaneous contributions. -- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function - in ``bcfg2-info``. -- Daniel Clark <dclark@pobox.com> created encap packages for bcfg2 and - deps, wrote fossil-scm dvcs support, and helps with Debian packaging. -- Danny Clark enabled the Encap packaging. -- David Dahl worked on Hostbase. -- David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support. -- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of the - Bcfg client and server and implemented a common logging infrastructure. -- Fabian Affolter <mail@fabian-affolter.ch> made some patches, added - some new features and plugins, and restructured the manual for Bcfg2. -- Jack Neely <jjneely@ncsu.edu> worked on YUMng (now YUM). -- James Yang <jjyang@mcs.anl.gov> worked on ``bcfg2-admin`` and - ``bcfg2-reports``. -- Jason Pepas <cell@ices.utexas.edu> has written a RPM package list creator - has contributed patches to the Red Hat toolset. -- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting subsystem, - including StatReports, GenerateHostinfo, and the xslt, css and javascript - associated with it. -- Jos Catnook fixed bugs. -- Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written the - Hostbase plugin. -- Michael Jinks <mjinks@uchicago.edu> wrote the Gentoo tool drivers. -- Narayan Desai <desai@mcs.anl.gov> has written most of Bcfg2, including all - parts not explicitly mentioned in this file. -- Patrick Ruckstuhl fixed bugs in the templating. -- Pedro Flores made the Reporting system design help. -- Raul Cuza <raulcuza@gmail.com> updated the documentation. -- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the tools - included in the ``tools/`` subdirectory. -- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more - robust. -- Sami Haahtinen <ressu@ressukka.net> has written Debian packaging logic. -- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written the - VHost plugin. -- Scott Matott -- Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the - project roadmap, and implements various interesting features. -- Ti Leggett worked on ebuild packaging and bugfixes, RPM packaging. -- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and made - plugins. -- Zach Lowry Solaris support and general hardening. - - -The entire MCS_ systems team has provided invaluable help in the -design process and refinement of the user interface. In particular, -Gene Rackow and Sandra Bittner have provided great assistance -throughout this project. Philip Steinbachs provided detailed -feedback as an early external user. - -The most updated listing is available in the AUTHORS_ file in the -git :term:`repository` for Bcfg2. diff --git a/doc/appendix/index.txt b/doc/appendix/index.txt index 407119e24..135d00bc8 100644 --- a/doc/appendix/index.txt +++ b/doc/appendix/index.txt @@ -11,7 +11,6 @@ Appendix files configuration - contributors books papers articles diff --git a/doc/development/compat.txt b/doc/development/compat.txt index b7bf87bec..90df45676 100644 --- a/doc/development/compat.txt +++ b/doc/development/compat.txt @@ -98,6 +98,8 @@ behavior (e.g., :func:`input`) do not cause unexpected side-effects. +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | reduce | :func:`reduce` | :func:`functools.reduce` | +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ +| long | :func:`long` | :func:`int` | ++---------------------------------+--------------------------------------------------+---------------------------------------------------------+ Python 2.4 compatibility ------------------------ diff --git a/doc/server/encryption.txt b/doc/server/encryption.txt index a701a42ca..28ca149f5 100644 --- a/doc/server/encryption.txt +++ b/doc/server/encryption.txt @@ -171,9 +171,8 @@ For instance:: .. note:: - The name of a passphrase **cannot** be "algorithm"; that - configuration option is reserved for configuring the cipher - algorithm. + The name of a passphrase **cannot** be ``algorithm`` or + ``decrypt``, which are reserved for other configuration options. This would define two separate encryption passphrases, presumably for use by two separate teams. The passphrase names are completely @@ -221,7 +220,7 @@ though, that may not be possible. (For instance, if you use encryption to protect data for your production environment from your staging Bcfg2 server, then you would not expect the staging server to be able to decrypt everything.) In this case, you want to enable lax -decryption in the ``[encryption]`` section of ``bcfg2.conf``: +decryption in the ``[encryption]`` section of ``bcfg2.conf``:: [encryption] decrypt = lax diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt index 8339c8080..4d35a5970 100644 --- a/doc/server/plugins/generators/cfg.txt +++ b/doc/server/plugins/generators/cfg.txt @@ -305,7 +305,7 @@ The Cheetah template is ignored. Exploiting this fact is probably a pretty bad idea in practice. You can mix Genshi and Cheetah when using different host-specific or -group-specific files. For example: +group-specific files. For example:: Cfg/etc/fstab/fstab.H_host.example.com.genshi Cfg/etc/fstab/fstab.G50_server.cheetah diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt index f178e1563..b11d1ebc5 100644 --- a/doc/server/plugins/generators/packages.txt +++ b/doc/server/plugins/generators/packages.txt @@ -476,9 +476,10 @@ Package Groups -------------- Yum package groups are supported by the native Yum libraries. To -include a package group, use the :xml:attribute:`PackageType:group` -attribute of the :xml:element:`Package` tag. You can use either the -short group ID or the long group name: +include a package group, use the +:xml:attribute:`PackageStructure:group` attribute of the +:xml:element:`Package` tag. You can use either the short group ID or +the long group name: .. code-block:: xml @@ -501,13 +502,22 @@ Valid values of "type" are: * ``optional`` or ``all``: Install all packages in the group, including mandatory, default, and optional packages. -See :xml:element:`PackageStructure` for details. +See :xml:type:`PackageStructure` for details. You can view the packages in a group by category with the ``yum groupinfo`` command. More information about the different levels can be found at http://fedoraproject.org/wiki/How_to_use_and_edit_comps.xml_for_package_groups#Installation +Abstract Package Tags +--------------------- + +If you are using the native Yum libraries, the abstract Package tag +supports several attributes in addition to the standard +:xml:attribute:`PackageStructure:name`: + +.. xml:type:: PackageStructure + .. _pulp-source-support: Pulp Support diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt index adcb55d3e..bcd7342c9 100644 --- a/doc/server/plugins/generators/rules.txt +++ b/doc/server/plugins/generators/rules.txt @@ -375,7 +375,7 @@ For example: <MemberOf>lp</MemberOf> <MemberOf>adm</MemberOf> <MemberOf>bin</MemberOf> - </BoundPOSIXUser> + </POSIXUser> The group specified will automatically be created if it does not exist, even if there is no :xml:type:`POSIXGroup tag <POSIXGroupType>` |