diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
| commit | bdcbded3236fa76f011c8d594c4b261c8b816199 (patch) | |
| tree | 23d9886731ccbf52e8f3d3d9ccc0cfeb8dbb273a /doc | |
| parent | 864bce0515b85f206381ac033875b12d06a2540d (diff) | |
| parent | 5c9cd24767bcbc8cdb39eebf2fd81e9c814c01af (diff) | |
| download | bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.gz bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.bz2 bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.zip | |
Merge branch 'maint'
Conflicts:
doc/client/tools/actions.txt
schemas/authorizedkeys.xsd
src/lib/Bcfg2/Client/Frame.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/client/tools/actions.txt | 24 | ||||
| -rw-r--r-- | doc/server/plugins/generators/cfg.txt | 3 |
2 files changed, 22 insertions, 5 deletions
diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt index 61bb8854b..52d07eb4f 100644 --- a/doc/client/tools/actions.txt +++ b/doc/client/tools/actions.txt @@ -30,10 +30,11 @@ return status, causing failures to still not be centrally reported. If central reporting of action failure is desired, set this attribute to 'check'. -Actions are not completely defined inside of a bundle; they are an -abstract entry. The Rules plugin can bind these entries. For example -to include the above action in a bundle, first the Action entry must -be included in the bundle: +Actions may be completely defined inside of a bundle with the use of +:ref:`server-configurationentries`, much like Packages, Services or Paths. +The Rules plugin can also bind these entries. For example to include the +above action in a bundle, first the Action entry must be included in the +bundle: .. code-block:: xml @@ -79,3 +80,18 @@ requires this key. <Action timing='post' name='apt-key-update' command='apt-key adv --recv-keys --keyserver hkp://pgp.mit.edu 0C5A2783' when='modified' status='check'/> </Group> </Rules> + +Example BoundAction (add RPM GPG keys) +====================================== + +This example will add the RPM-GPG-KEY-redhat-release key to the RPM +GPG keyring **before** Package entries are handled on the client run. + +.. code-block:: xml + + <Bundle name="rpm-gpg-keys"> + <Group name='rhel'> + <Path name="/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"/> + <BoundAction timing="pre" name="install rpm key" command="rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release" when="modified" status="check"/> + </Group> + </Bundle> diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt index 8220fb21b..7a404c824 100644 --- a/doc/server/plugins/generators/cfg.txt +++ b/doc/server/plugins/generators/cfg.txt @@ -539,7 +539,8 @@ Example </Group> <Allow from="/root/.ssh/id_rsa.pub" host="foo.example.com"/> <Allow from="/home/foo_user/.ssh/id_rsa.pub"> - <Params command="/home/foo_user/.ssh/ssh_command_filter"/> + <Option name="command" value="/home/foo_user/.ssh/ssh_command_filter"/> + <Option name="no-X11-forwarding"/> </Allow> <Allow> ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDw/rgKQeARRAHK5bQQhAAe1b+gzdtqBXWrZIQ6cIaLgxqj76TwZ3DY4A6aW9RgC4zzd0p4a9MfsScUIB4+UeZsx9GopUj4U6H8Vz7S3pXxrr4E9logVLuSfOLFbI/wMWNRuOANqquLYQ+JYWKeP4kagkVp0aAWp7mH5IOI0rp0A6qE2you4ep9N/nKvHDrtypwhYBWprsgTUXXMHnAWGmyuHGYWxNYBV9AARPdAvZfb8ggtuwibcOULlyK4DdVNbDTAN1/BDBE1ve6WZDcrc386KhqUGj/yoRyPjNZ46uZiOjRr3cdY6yUZoCwzzxvm5vle6mEbLjHgjGEMQMArzM9 vendor@example.com |