diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-02-26 22:27:31 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-02-26 22:31:26 -0500 |
commit | af299bf3e5b61fb57d1602083956667e3d7c8a2b (patch) | |
tree | 3b04037baa77fa15cf472c825ebd49ccc1df5031 | |
parent | 1d7c5d59aa34380e3f9cb43d75bb1fa8220583fc (diff) | |
download | bcfg2-af299bf3e5b61fb57d1602083956667e3d7c8a2b.tar.gz bcfg2-af299bf3e5b61fb57d1602083956667e3d7c8a2b.tar.bz2 bcfg2-af299bf3e5b61fb57d1602083956667e3d7c8a2b.zip |
doc: use path globbing in examples
-rw-r--r-- | doc/appendix/guides/import-existing-ssh-keys.txt | 12 | ||||
-rw-r--r-- | doc/server/plugins/structures/bundler/nagios.txt | 19 | ||||
-rw-r--r-- | doc/server/plugins/structures/bundler/torque.txt | 4 | ||||
-rw-r--r-- | doc/server/xml-common.txt | 28 | ||||
-rw-r--r-- | doc/unsorted/writing_specification.txt | 28 |
5 files changed, 18 insertions, 73 deletions
diff --git a/doc/appendix/guides/import-existing-ssh-keys.txt b/doc/appendix/guides/import-existing-ssh-keys.txt index 6ce41ba60..0b396d327 100644 --- a/doc/appendix/guides/import-existing-ssh-keys.txt +++ b/doc/appendix/guides/import-existing-ssh-keys.txt @@ -21,7 +21,17 @@ Add a bundle for ssh After verifying that SSHbase is listed on the plugins line in ``/etc/bcfg2.conf``, you need to create a bundle containing the -appropriate entries. +appropriate entries. In general, you can use a path glob: + +.. code-block:: xml + + <Bundle> + <Path glob="/etc/ssh/*"/> + </Bundle> + +If you need more granular control -- e.g., other entries in +``/etc/ssh`` are specified in other bundles -- you can also list the +files explicity: .. code-block:: xml diff --git a/doc/server/plugins/structures/bundler/nagios.txt b/doc/server/plugins/structures/bundler/nagios.txt index d25e1cf0a..47a61b898 100644 --- a/doc/server/plugins/structures/bundler/nagios.txt +++ b/doc/server/plugins/structures/bundler/nagios.txt @@ -27,29 +27,14 @@ the clients. <Path name='/etc/hosts.deny'/> <Path name='/etc/services'/> <Path name='/etc/snmpd.conf'/> - <Path name='/usr/lib/nagios/plugins/check_disks_scratchgpfs1.tg'/> - <Path name='/usr/lib/nagios/plugins/check_fs.mds'/> - <Path name='/usr/lib/nagios/plugins/check_gm_network.tg'/> - <Path name='/usr/lib/nagios/plugins/check_gpfs_wan.tg'/> - <Path name='/usr/lib/nagios/plugins/check_hung_jobs.tg'/> - <Path name='/usr/lib/nagios/plugins/check_mem.mds'/> - <Path name='/usr/lib/nagios/plugins/check_mem.tg'/> - <Path name='/usr/lib/nagios/plugins/check_nvidia_acceleration.tg'/> - <Path name='/usr/lib/nagios/plugins/check_os.mds'/> - <Path name='/usr/lib/nagios/plugins/check_procinfo.mds'/> - <Path name='/usr/lib/nagios/plugins/check_torque.tg'/> - <Path name='/usr/lib/nagios/plugins/check_uname_r.tg'/> - <Path name='/usr/lib/nagios/plugins/check_uname_r.tg.conf'/> + <Path glob='/usr/lib/nagios/plugins/*'/> <Service name='snmpd'/> <Group name='nagios-server'> <Package name='nagios'/> <Package name='nagios-devel'/> <Package name='nagios-www'/> <Path name='/etc/httpd/conf.d/nagios.conf'/> - <Path name='/etc/nagios/cgi.cfg'/> - <Path name='/etc/nagios/checkcommands.cfg'/> - <Path name='/etc/nagios/nagios.cfg'/> - <Path name='/etc/nagios/resource.cfg'/> + <Path glob='/etc/nagios/*'/> </Group> </Bundle> diff --git a/doc/server/plugins/structures/bundler/torque.txt b/doc/server/plugins/structures/bundler/torque.txt index f6349df6e..01316f3a3 100644 --- a/doc/server/plugins/structures/bundler/torque.txt +++ b/doc/server/plugins/structures/bundler/torque.txt @@ -29,9 +29,7 @@ A longer Bundle that includes many group-specific entries. <BoundPath type='directory' owner='root' group='root' mode='0755' name='/var/spool/torque/mom_logs'/> <BoundPath type='directory' owner='root' group='root' mode='0755' name='/var/spool/torque/mom_priv'/> <BoundPath type='directory' owner='root' group='root' mode='0755' name='/var/spool/torque/mom_priv/jobs'/> - <Path name='/var/spool/torque/mom_priv/config'/> - <Path name='/var/spool/torque/mom_priv/prologue'/> - <Path name='/var/spool/torque/mom_priv/epilogue'/> + <Path glob='/var/spool/torque/mom_priv/*'/> </Group> <Group name='torque-server'> <Service name='torque_server'/> diff --git a/doc/server/xml-common.txt b/doc/server/xml-common.txt index 3aacfd468..ab558c2cb 100644 --- a/doc/server/xml-common.txt +++ b/doc/server/xml-common.txt @@ -81,15 +81,7 @@ As an example, consider the following :ref:`bundle .. code-block:: xml <Bundle> - <Path name='/etc/ssh/ssh_host_dsa_key'/> - <Path name='/etc/ssh/ssh_host_rsa_key'/> - <Path name='/etc/ssh/ssh_host_dsa_key.pub'/> - <Path name='/etc/ssh/ssh_host_rsa_key.pub'/> - <Path name='/etc/ssh/ssh_host_key'/> - <Path name='/etc/ssh/ssh_host_key.pub'/> - <Path name='/etc/ssh/sshd_config'/> - <Path name='/etc/ssh/ssh_config'/> - <Path name='/etc/ssh/ssh_known_hosts'/> + <Path glob='/etc/ssh/*'/> <Group name='rpm'> <Package name='openssh'/> <Package name='openssh-askpass'/> @@ -122,23 +114,7 @@ any other clients. +------------------------+-----------------------------------+ | Group/Hostname | Entry | +========================+===================================+ -| all | ``/etc/ssh/ssh_host_dsa_key`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_host_rsa_key`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_host_dsa_key.pub`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_host_rsa_key.pub`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_host_key`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_host_key.pub`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/sshd_config`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_config`` | -+------------------------+-----------------------------------+ -| all | ``/etc/ssh/ssh_known_hosts`` | +| all | ``/etc/ssh/*`` | +------------------------+-----------------------------------+ | ``rpm`` | Package ``openssh`` | +------------------------+-----------------------------------+ diff --git a/doc/unsorted/writing_specification.txt b/doc/unsorted/writing_specification.txt index e7763cee1..f9dd30a14 100644 --- a/doc/unsorted/writing_specification.txt +++ b/doc/unsorted/writing_specification.txt @@ -132,15 +132,7 @@ The following is an annotated copy of a bundle: .. code-block:: xml <Bundle> - <Path name='/etc/ssh/ssh_host_dsa_key'/> - <Path name='/etc/ssh/ssh_host_rsa_key'/> - <Path name='/etc/ssh/ssh_host_dsa_key.pub'/> - <Path name='/etc/ssh/ssh_host_rsa_key.pub'/> - <Path name='/etc/ssh/ssh_host_key'/> - <Path name='/etc/ssh/ssh_host_key.pub'/> - <Path name='/etc/ssh/sshd_config'/> - <Path name='/etc/ssh/ssh_config'/> - <Path name='/etc/ssh/ssh_known_hosts'/> + <Path glob='/etc/ssh/*'/> <Group name='rpm'> <Package name='openssh'/> <Package name='openssh-askpass'/> @@ -171,23 +163,7 @@ can be used in bundles) +----------------+-------------------------------+ | Group | Entry | +================+===============================+ -| all | /etc/ssh/ssh_host_dsa_key | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_host_rsa_key | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_host_dsa_key.pub | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_host_rsa_key.pub | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_host_key | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_host_key.pub | -+----------------+-------------------------------+ -| all | /etc/ssh/sshd_config | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_config | -+----------------+-------------------------------+ -| all | /etc/ssh/ssh_known_hosts | +| all | /etc/ssh/* | +----------------+-------------------------------+ | rpm | Package openssh | +----------------+-------------------------------+ |