From 2d725c3763fd938423018bb572386d2b96931861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Thu, 22 Sep 2011 22:30:18 +0200
Subject: Action: Add "build" attribute to Schema and docs

Add the "build" attribute for <Action> entries to the XML Schema and to
the documentation.
---
 doc/client/tools/actions.txt        |  6 +++++-
 doc/server/configurationentries.txt | 22 +++++++++++-----------
 schemas/defaults.xsd                |  1 +
 schemas/rules.xsd                   |  1 +
 4 files changed, 18 insertions(+), 12 deletions(-)

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
diff --git a/doc/server/configurationentries.txt b/doc/server/configurationentries.txt
index fbce092b9..be9ea987c 100644
--- a/doc/server/configurationentries.txt
+++ b/doc/server/configurationentries.txt
@@ -22,17 +22,17 @@ entries used by Bcfg2.
 Non-POSIX entries
 =================
 
-+-------------+---------------------+-----------------------------+
-| TagName     | Description         | Attributes                  |
-+=============+=====================+=============================+
-| Action      | Command             | name, command, when, timing |
-+-------------+---------------------+-----------------------------+
-| Package     | Software Packages   | name, type, version, url    |
-+-------------+---------------------+-----------------------------+
-| PostInstall | PostInstall command | name                        |
-+-------------+---------------------+-----------------------------+
-| Service     | System Services     | name, type, status, target  |
-+-------------+---------------------+-----------------------------+
++-------------+---------------------+--------------------------------------------+
+| TagName     | Description         | Attributes                                 |
++=============+=====================+============================================+
+| Action      | Command             | name, command, when, timing, status, build |
++-------------+---------------------+--------------------------------------------+
+| Package     | Software Packages   | name, type, version, url                   |
++-------------+---------------------+--------------------------------------------+
+| PostInstall | PostInstall command | name                                       |
++-------------+---------------------+--------------------------------------------+
+| Service     | System Services     | name, type, status, target                 |
++-------------+---------------------+--------------------------------------------+
 
 .. note::
 
diff --git a/schemas/defaults.xsd b/schemas/defaults.xsd
index d19c8a564..27e749470 100644
--- a/schemas/defaults.xsd
+++ b/schemas/defaults.xsd
@@ -16,6 +16,7 @@
     <xsd:attribute type="ActionTimingEnum" name="timing"/>
     <xsd:attribute type="ActionWhenEnum" name="when"/>
     <xsd:attribute type="ActionStatusEnum" name="status"/>
+    <xsd:attribute type="xsd:boolean" name="build"/>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="command"/>
   </xsd:complexType>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 3d9870dfb..193d63c99 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -19,6 +19,7 @@
     <xsd:attribute type='ActionTimingEnum' name='timing'/>
     <xsd:attribute type='ActionWhenEnum' name='when'/>
     <xsd:attribute type='ActionStatusEnum' name='status'/>
+    <xsd:attribute type="xsd:boolean" name="build"/>
     <xsd:attribute type='xsd:string' name='name'/>
     <xsd:attribute type='xsd:string' name='command'/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
-- 
cgit v1.2.3-1-g7c22