summaryrefslogtreecommitdiffstats
path: root/doc/server
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-26 22:27:31 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-26 22:31:26 -0500
commitaf299bf3e5b61fb57d1602083956667e3d7c8a2b (patch)
tree3b04037baa77fa15cf472c825ebd49ccc1df5031 /doc/server
parent1d7c5d59aa34380e3f9cb43d75bb1fa8220583fc (diff)
downloadbcfg2-af299bf3e5b61fb57d1602083956667e3d7c8a2b.tar.gz
bcfg2-af299bf3e5b61fb57d1602083956667e3d7c8a2b.tar.bz2
bcfg2-af299bf3e5b61fb57d1602083956667e3d7c8a2b.zip
doc: use path globbing in examples
Diffstat (limited to 'doc/server')
-rw-r--r--doc/server/plugins/structures/bundler/nagios.txt19
-rw-r--r--doc/server/plugins/structures/bundler/torque.txt4
-rw-r--r--doc/server/xml-common.txt28
3 files changed, 5 insertions, 46 deletions
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`` |
+------------------------+-----------------------------------+