summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgordon <gordon@herald.private.dragonsdawn.net>2011-01-21 19:27:34 -0800
committerNarayan Desai <desai@mcs.anl.gov>2011-01-22 09:37:11 -0600
commitafcce3a9211e8f71c88afb9d4e9c97f5cbe77a00 (patch)
tree23917de00e7606bcee461664879384ee7126ebd1
parente8f5b43c4f822a77ef3869701dd5ae9aaa1c1da9 (diff)
downloadbcfg2-afcce3a9211e8f71c88afb9d4e9c97f5cbe77a00.tar.gz
bcfg2-afcce3a9211e8f71c88afb9d4e9c97f5cbe77a00.tar.bz2
bcfg2-afcce3a9211e8f71c88afb9d4e9c97f5cbe77a00.zip
Make references to "plugins" more consistent. By eliminating most references to the standard set, the documentation should be accurate more often as the standard set changes.
-rw-r--r--doc/appendix/guides/centos.txt2
-rw-r--r--doc/appendix/guides/fedora.txt2
-rw-r--r--doc/appendix/guides/ubuntu.txt4
-rw-r--r--doc/appendix/guides/web-reports-install.txt4
-rw-r--r--doc/server/plugins/generators/nagiosgen.txt2
-rw-r--r--doc/server/plugins/generators/tcheetah.txt2
-rw-r--r--doc/server/plugins/statistics/dbstats.txt2
7 files changed, 9 insertions, 9 deletions
diff --git a/doc/appendix/guides/centos.txt b/doc/appendix/guides/centos.txt
index abbbefec6..b0321eebc 100644
--- a/doc/appendix/guides/centos.txt
+++ b/doc/appendix/guides/centos.txt
@@ -248,7 +248,7 @@ arch group membership. For this, we will make use of the
Probes to your plugins line in ``bcfg2.conf`` and create the Probe.::
[root@centos ~]# grep plugins /etc/bcfg2.conf
- plugins = Base,Bundler,Cfg,Metadata,Packages,Probes,Rules,SSHbase
+ plugins = Base,Bundler,Cfg,...,Probes
[root@centos ~]# mkdir /var/lib/bcfg2/Probes
[root@centos ~]# cat /var/lib/bcfg2/Probes/groups
#!/bin/sh
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt
index 1dd4f6db0..f32eaa8c6 100644
--- a/doc/appendix/guides/fedora.txt
+++ b/doc/appendix/guides/fedora.txt
@@ -139,7 +139,7 @@ The ``bcfg2.conf`` file contains only standard plugins so far.
[server]
repository = /var/lib/bcfg2
- plugins = Base,Bundler,Cfg,Metadata,Pkgmgr,Rules,SSHbase
+ plugins = SSHbase,Cfg,Pkgmgr,Rules,Metadata,Base,Bundler
[statistics]
sendmailpath = /usr/lib/sendmail
diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt
index 595005018..54aa62cce 100644
--- a/doc/appendix/guides/ubuntu.txt
+++ b/doc/appendix/guides/ubuntu.txt
@@ -119,7 +119,7 @@ Replace Pkgmgr with Packages in the plugins line of ``bcfg2.conf``::
root@lucid:~# cat /etc/bcfg2.conf
[server]
repository = /var/lib/bcfg2
- plugins = Base,Bundler,Cfg,Metadata,Packages,Rules,SSHbase
+ plugins = SSHbase,Cfg,Packages,Rules,Metadata,Base,Bundler
[statistics]
sendmailpath = /usr/lib/sendmail
@@ -207,7 +207,7 @@ Probes to your plugins line in ``bcfg2.conf`` and create the Probe.
.. code-block:: sh
root@lucid:~# grep plugins /etc/bcfg2.conf
- plugins = Base,Bundler,Cfg,Metadata,Packages,Probes,Rules,SSHbase
+ plugins = Base,Bundler,Cfg,...,Probes
root@lucid:~# mkdir /var/lib/bcfg2/Probes
root@lucid:~# cat /var/lib/bcfg2/Probes/groups
#!/bin/sh
diff --git a/doc/appendix/guides/web-reports-install.txt b/doc/appendix/guides/web-reports-install.txt
index 39b08cbf1..7ec7efb4e 100644
--- a/doc/appendix/guides/web-reports-install.txt
+++ b/doc/appendix/guides/web-reports-install.txt
@@ -136,7 +136,7 @@ Add DBStats to the plugins line of ``bcfg2.conf``. The resulting
[server]
repository = /var/lib/bcfg2
- plugins = Base,Bundler,Cfg,DBStats,Metadata,Packages,Probes,Rules,SSHbase
+ plugins = Base,Bundler,Cfg,...,DBStats
Start/restart the Bcfg2 server::
@@ -160,7 +160,7 @@ then have something like this::
[server]
repository = /var/lib/bcfg2
- plugins = Base,Bundler,Cfg,DBStats,Metadata,Packages,Probes,Rules,SSHbase
+ plugins = Base,Bundler,Cfg,...,DBStats
[statistics]
sendmailpath = /usr/lib/sendmail
diff --git a/doc/server/plugins/generators/nagiosgen.txt b/doc/server/plugins/generators/nagiosgen.txt
index 0ab2868e8..8cd18ca4f 100644
--- a/doc/server/plugins/generators/nagiosgen.txt
+++ b/doc/server/plugins/generators/nagiosgen.txt
@@ -12,7 +12,7 @@ This page describes the installation and use of the `NagiosGen`_ plugin.
Update ``/etc/bcfg2.conf``, adding NagiosGen to plugins::
- plugins = SSHbase,Cfg,Pkgmgr,Rules,TCheetah,TWbase,NagiosGen
+ plugins = Base,Bundler,Cfg,...,NagiosGen
Create the NagiosGen directory::
diff --git a/doc/server/plugins/generators/tcheetah.txt b/doc/server/plugins/generators/tcheetah.txt
index 5819bba96..6c568d05f 100644
--- a/doc/server/plugins/generators/tcheetah.txt
+++ b/doc/server/plugins/generators/tcheetah.txt
@@ -19,7 +19,7 @@ engine from http://www.cheetahtemplate.org/. Once it is installed,
you can enable it by adding ``TCheetah`` to the ``plugins`` line in
``/etc/bcfg2.conf`` on your Bcfg server. For example::
- plugins = Cfg,Metadata,Pkgmgr,Rules,SSHbase,TCheetah
+ plugins = Base,Bundler,Cfg,...,TCheetah
The ``TCheetah`` plugin makes use of a ``Cfg``-like directory structure
located in in a ``TCheetah`` subdirectory of your repository, usually
diff --git a/doc/server/plugins/statistics/dbstats.txt b/doc/server/plugins/statistics/dbstats.txt
index 8e50df822..dd25fe9ab 100644
--- a/doc/server/plugins/statistics/dbstats.txt
+++ b/doc/server/plugins/statistics/dbstats.txt
@@ -9,7 +9,7 @@ DBStats
DBStats can be enabled by adding DBStats to the plugins line in
``/etc/bcfg2.conf``:
- plugins = DBStats
+ plugins = Base,Bundler,Cfg,...,DBStats
For more information on how to use DBStats to setup reporting, see
:ref:`server-reports-dynamic`.