summaryrefslogtreecommitdiffstats
path: root/doc/client
diff options
context:
space:
mode:
Diffstat (limited to 'doc/client')
-rw-r--r--doc/client/agent.txt2
-rw-r--r--doc/client/tools/actions.txt6
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/client/agent.txt b/doc/client/agent.txt
index ef152133e..770c2a41c 100644
--- a/doc/client/agent.txt
+++ b/doc/client/agent.txt
@@ -24,7 +24,7 @@ is pretty easy:
The key fingerprint is:
aa:25:9b:a7:10:60:f3:eb:2b:ae:4b:1a:42:1b:63:5d desai@ubik
-#. Add this this public key to root's authorized_keys file, with several
+#. Add this public key to root's authorized_keys file, with several
commands prepended to it::
command="/usr/sbin/bcfg2 -q <other options>",no-port-forwarding,no-X11-forwarding,no-pty,no-agent-forwarding,from="<bcfg2-server ipaddr>" <pub key>
diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt
index 11922b00d..49488dfbe 100644
--- a/doc/client/tools/actions.txt
+++ b/doc/client/tools/actions.txt
@@ -20,7 +20,8 @@ so they can be centrally observed. Actions look like:
name='name'
command='cmd text'
when='always|modified'
- status='ignore|check'/>
+ status='ignore|check'
+ build='true|false'/>
+-----------+------------------+-------------------------------------------+
| Attribute | Values | Meaning |
@@ -37,6 +38,9 @@ so they can be centrally observed. Actions look like:
| status | ignore, check | If the return code of the action |
| | | should be reported or not |
+-----------+------------------+-------------------------------------------+
+| build | true, false | Also execute the action in build mode |
+| | | (default: true) |
++-----------+------------------+-------------------------------------------+
Note that the status attribute tells the bcfg2 client to ignore
return status, causing failures to still not be centrally reported. If