Options: schema changes for changes made for new parser

15 files changed, 113 insertions, 29 deletions

diff --git a/schemas/acl-metadata.xsd b/schemas/acl-metadata.xsd
index 68994c940..643dfec7f 100644
--- a/schemas/acl-metadata.xsd
+++ b/schemas/acl-metadata.xsd
@@ -62,6 +62,14 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:group ref="MetadataACLElements" minOccurs="1" maxOccurs="unbounded"/>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
   </xsd:complexType>
 
   <xsd:group name="MetadataACLElements">
diff --git a/schemas/authorizedkeys.xsd b/schemas/authorizedkeys.xsd
index fd8f2a7a3..20e568a07 100644
--- a/schemas/authorizedkeys.xsd
+++ b/schemas/authorizedkeys.xsd
@@ -111,6 +111,14 @@
       <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
       <xsd:element name="AuthorizedKeys" type="AuthorizedKeysType"/>
     </xsd:choice>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index d5abf2d94..aeacd0517 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -351,6 +351,14 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
     <xsd:attribute ref="xml:base"/>
   </xsd:complexType>
diff --git a/schemas/decisions.xsd b/schemas/decisions.xsd
index c87d2a984..9df4b1215 100644
--- a/schemas/decisions.xsd
+++ b/schemas/decisions.xsd
@@ -64,6 +64,14 @@
       <xsd:element name="Client" type="DecisionsGroupType"/>
       <xsd:group ref="py:genshiElements"/>
     </xsd:choice>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
diff --git a/schemas/defaults.xsd b/schemas/defaults.xsd
index 17ae84366..f810a6269 100644
--- a/schemas/defaults.xsd
+++ b/schemas/defaults.xsd
@@ -35,6 +35,14 @@
         <xsd:element name="Client" type="DContainerType"/>
       </xsd:choice>
       <xsd:attribute name="priority" type="xsd:integer" use="required"/>
+      <xsd:attribute name="lax_decryption" type="xsd:boolean">
+        <xsd:annotation>
+          <xsd:documentation>
+            Override the global lax_decryption setting in
+            ``bcfg2.conf``.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/fileprobes.xsd b/schemas/fileprobes.xsd
index 12f60378c..64f01bf8e 100644
--- a/schemas/fileprobes.xsd
+++ b/schemas/fileprobes.xsd
@@ -37,6 +37,14 @@
         <xsd:element name="Group" type="FileProbesGroupType"/>
         <xsd:element name="Client" type="FileProbesGroupType"/>
       </xsd:choice>
+      <xsd:attribute name="lax_decryption" type="xsd:boolean">
+        <xsd:annotation>
+          <xsd:documentation>
+            Override the global lax_decryption setting in
+            ``bcfg2.conf``.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/info.xsd b/schemas/info.xsd
index 9b898a168..5291562c1 100644
--- a/schemas/info.xsd
+++ b/schemas/info.xsd
@@ -135,6 +135,14 @@
       <xsd:element name='Path' type='InfoGroupType'/>
       <xsd:element name='Info' type='InfoType'/>
     </xsd:choice>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
   </xsd:complexType>
 
   <xsd:element name='FileInfo' type="FileInfoType"/>
diff --git a/schemas/nagiosgen.xsd b/schemas/nagiosgen.xsd
index b3ccf5095..24c298885 100644
--- a/schemas/nagiosgen.xsd
+++ b/schemas/nagiosgen.xsd
@@ -35,6 +35,14 @@
         <xsd:element name="Group" type="NagiosGenGroupType"/>
         <xsd:element name="Client" type="NagiosGenGroupType"/>
       </xsd:choice>
+      <xsd:attribute name="lax_decryption" type="xsd:boolean">
+        <xsd:annotation>
+          <xsd:documentation>
+            Override the global lax_decryption setting in
+            ``bcfg2.conf``.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index e01093c56..e57280527 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -240,6 +240,14 @@
       <xsd:element name="Source" type="SourceType"/>
       <xsd:element name="Sources" type="SourcesType"/>
     </xsd:choice>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attribute ref="xml:base"/>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
diff --git a/schemas/pkgtype.xsd b/schemas/pkgtype.xsd
index 18eda88ab..c76c52824 100644
--- a/schemas/pkgtype.xsd
+++ b/schemas/pkgtype.xsd
@@ -146,38 +146,33 @@
               </xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="installed_action" type="xsd:string"
-                         default="install">
+          <xsd:attribute name="install_missing" type="xsd:boolean"
+                         default="true">
             <xsd:annotation>
               <xsd:documentation>
-                If this is set to any value other than "install",
-                package installation will be suppressed with the
-                :ref:`YUM24 and RPM &lt;client-tools-yum&gt;` drivers.
+                Whether or not to install missing packages. This is
+                only honored by the the :ref:`RPM
+                &lt;client-tools-yum&gt;` driver.
               </xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="version_fail_action" type="xsd:string"
-                         default="upgrade">
+          <xsd:attribute name="fix_version" type="xsd:boolean" default="true">
             <xsd:annotation>
               <xsd:documentation>
-                If this is set to any value other than "upgrade", a
-                package that has the incorrect version installed will
-                not be fixed with the :ref:`YUM24 and RPM
-                &lt;client-tools-yum&gt;` drivers.  Note that
-                "upgrade" is misleading; if a package is installed
-                that is newer than the desired version, it will not be
-                downgraded if this attribute is set to anything other
-                than "upgrade".
+                Whether or not to upgrade or downgrade packages that
+                are installed, but have the wrong version. This is
+                only honored by the :ref:`RPM
+                &lt;client-tools-yum&gt;` driver.
               </xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
-          <xsd:attribute name="verify_fail_action" type="xsd:string">
+          <xsd:attribute name="reinstall_broken" type="xsd:boolean"
+                         default="true">
             <xsd:annotation>
               <xsd:documentation>
-                If this is set to any value other than "reinstall", a
-                package that fails package verification will not be
-                reinstalled with the :ref:`YUM24 and RPM
-                &lt;client-tools-yum&gt;` drivers.
+                Whether or not to reinstall packages that fail
+                verification. This is only honored by the :ref:`RPM
+                &lt;client-tools-yum&gt;` driver.
               </xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index 0bb1b7184..30bc8a1b3 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -144,10 +144,10 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
-      <xsd:attribute name="decrypt" type="EncryptStrictnessEnum">
+      <xsd:attribute name="lax_decryption" type="xsd:boolean">
         <xsd:annotation>
           <xsd:documentation>
-            Override the global strict/lax decryption setting in
+            Override the global lax_decryption setting in
             ``bcfg2.conf``.
           </xsd:documentation>
         </xsd:annotation>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index be60abef0..fb41ad9d4 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -198,6 +198,14 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attribute name="lax_decryption" type="xsd:boolean">
+        <xsd:annotation>
+          <xsd:documentation>
+            Override the global lax_decryption setting in
+            ``bcfg2.conf``.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
       <xsd:attributeGroup ref="py:genshiAttrs"/>
     </xsd:complexType>
   </xsd:element>
diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd
index 49d821aaf..a3f6db94d 100644
--- a/schemas/sslca-cert.xsd
+++ b/schemas/sslca-cert.xsd
@@ -171,6 +171,14 @@
       <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
       <xsd:element name="CertInfo" type="CertInfoType"/>
     </xsd:choice>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
   </xsd:complexType>
 
   <xsd:element name="CertInfo" type="CertInfoType"/>
diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd
index 2b6a02b98..261b71e1a 100644
--- a/schemas/sslca-key.xsd
+++ b/schemas/sslca-key.xsd
@@ -91,6 +91,14 @@
       <xsd:element name="Client" type="SSLCAKeyGroupType"/>
       <xsd:element name="KeyInfo" type="KeyInfoType"/>
     </xsd:choice>
+    <xsd:attribute name="lax_decryption" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Override the global lax_decryption setting in
+          ``bcfg2.conf``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
   </xsd:complexType>
 
   <xsd:element name="KeyInfo" type="KeyInfoType"/>
diff --git a/schemas/types.xsd b/schemas/types.xsd
index dbb0c0390..5dec03cdb 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -103,13 +103,6 @@
     </xsd:restriction>
   </xsd:simpleType>
 
-  <xsd:simpleType name="EncryptStrictnessEnum">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="strict"/>
-      <xsd:enumeration value="lax"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
   <xsd:complexType name='ActionType'>
     <xsd:annotation>
       <xsd:documentation>