From 21b61ddd859b7baa1bbf192084926ad9927e5092 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@nb.localdomain>
Date: Mon, 27 Oct 2008 22:30:21 +0100
Subject: added condition and cleanup flag to ipaaction

---
 ipaaction/ipaaction.rng                | 21 ++++++++++++++++++---
 ipaaction/ipaaction_example_policy.xml |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'ipaaction')

diff --git a/ipaaction/ipaaction.rng b/ipaaction/ipaaction.rng
index 8500275..2f6fb57 100644
--- a/ipaaction/ipaaction.rng
+++ b/ipaaction/ipaaction.rng
@@ -39,9 +39,16 @@ xmlns:pa="http://freeipa.org/xml/rng/ns/plugable_architecture/1.0">
       </s:pattern>
         <optional>
           <element name="condition">
-            <data type="string">
-              <param name="pattern">/.*</param>
-            </data>
+            <element name="command">
+              <data type="string">
+                <param name="pattern">/.*</param>
+              </data>
+            </element>
+            <optional>
+              <element name="expected_output">
+                <text/>
+              </element>
+            </optional>
           </element>
         </optional>
         <oneOrMore>
@@ -81,6 +88,14 @@ xmlns:pa="http://freeipa.org/xml/rng/ns/plugable_architecture/1.0">
                   </element>
                 </oneOrMore>
               </optional>
+              <optional>
+                <element name="cleanup">
+                  <choice>
+                    <value>yes</value>
+                    <value>no</value>
+                  </choice>
+                </element>
+              </optional>
             </element> <!-- file -->
             <element name="run">
               <element name="command">
diff --git a/ipaaction/ipaaction_example_policy.xml b/ipaaction/ipaaction_example_policy.xml
index e545703..061bc21 100644
--- a/ipaaction/ipaaction_example_policy.xml
+++ b/ipaaction/ipaaction_example_policy.xml
@@ -10,6 +10,9 @@
   </metadata>
 
   <ipaaction>
+    <condition>
+     <command>test -e /etc/redhat-release</command> 
+    </condition>
     <file>
       <url>http://my.server.org/something.txt</url>
       <path>/tmp/something.txt</path>
@@ -19,6 +22,7 @@
       <selinux_context>unconfined_u:object_r:user_home_t:s0</selinux_context>
       <acl>user:dummy:rw-</acl>
       <acl>user:admin:rw-</acl>
+      <cleanup>no</cleanup>
     </file>
     <run>
       <command>/bin/rm /tmp/something.txt</command>
-- 
cgit