From 72a80f89361145f1560ccc248f357a9de82eded6 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 17 Jan 2013 08:01:44 -0500
Subject: abstracted encryption support from Properties/CfgPrivateKeyCreator to
 StructFile

---
 schemas/types.xsd | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'schemas')

diff --git a/schemas/types.xsd b/schemas/types.xsd
index 524b327c5..144ef7337 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -371,6 +371,14 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:string" name="encrypted">
+      <xsd:annotation>
+        <xsd:documentation>
+          The name of the encryption passphrase that the text content
+          of this tag is encrypted with.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
-- 
cgit v1.2.3-1-g7c22


From aece6f8901711fa9e662b63f4f6b12cb90b84503 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 30 Oct 2012 09:05:23 -0400
Subject: removed deprecated PostInstall support

---
 schemas/bundle.xsd |  9 ---------
 schemas/rules.xsd  | 13 -------------
 2 files changed, 22 deletions(-)

(limited to 'schemas')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 68e793920..81bb9f0b5 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -80,15 +80,6 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name='PostInstall' type='StructureEntry'>
-        <xsd:annotation>
-          <xsd:documentation>
-            PostInstall entries are deprecated in favor of Action
-            entries. Actions can do everything PostInstall entries can
-            do and more.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name='BoundPackage' type='PackageType'>
         <xsd:annotation>
           <xsd:documentation>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index ddfb7ad0d..be60abef0 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -13,10 +13,6 @@
   <xsd:import namespace="http://genshi.edgewall.org/"
               schemaLocation="genshi.xsd"/>
 
-  <xsd:complexType name='PostInstallType'>
-    <xsd:attribute type='xsd:string' name='name' use='required'/>
-  </xsd:complexType>
-
   <xsd:group name="rulesElements">
     <xsd:choice>
       <xsd:group ref="py:genshiElements"/>
@@ -126,15 +122,6 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name='PostInstall' type='PostInstallType'>
-        <xsd:annotation>
-          <xsd:documentation>
-            PostInstall entries are deprecated in favor of Action
-            entries. Actions can do everything PostInstall entries can
-            do and more.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name='Group' type='RContainerType'>
         <xsd:annotation>
           <xsd:documentation>
-- 
cgit v1.2.3-1-g7c22


From 0fc1f472a0fb18911bde1cb99f03142681804476 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 30 Oct 2012 10:22:02 -0400
Subject: removed deprecated plugins: TGenshi, TCheetah, Account, Hostbase,
 Snapshots, Statistics, Editor

---
 schemas/bundle.xsd | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'schemas')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 81bb9f0b5..863e10b4b 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -35,10 +35,7 @@
         <xsd:annotation>
           <xsd:documentation>
             Abstract implementation of a Path entry.  The entry will
-            either be handled by Cfg, TGenshi, or another
-            Generator plugin; or handled by Rules, in which case
-            the full specification of this entry will be included in
-            Rules.
+            be handled by a Generator plugin, like Cfg or Rules.
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-- 
cgit v1.2.3-1-g7c22


From dfe9dac83a9f6553b9d075fa14fcd28235aabda9 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 13:51:38 -0500
Subject: updated StructFile schemas to allow genshi attrs/elements

---
 schemas/authorizedkeys.xsd | 10 ++++++++++
 schemas/fileprobes.xsd     |  7 +++++++
 schemas/nagiosgen.xsd      |  8 ++++++++
 schemas/packages.xsd       | 10 ++++++++++
 schemas/privkey.xsd        |  9 +++++++++
 schemas/pubkey.xsd         |  3 +++
 schemas/sslca-cert.xsd     |  7 +++++++
 schemas/sslca-key.xsd      |  7 +++++++
 8 files changed, 61 insertions(+)

(limited to 'schemas')

diff --git a/schemas/authorizedkeys.xsd b/schemas/authorizedkeys.xsd
index 848f99bae..ca238d492 100644
--- a/schemas/authorizedkeys.xsd
+++ b/schemas/authorizedkeys.xsd
@@ -6,6 +6,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="AuthorizedKeysGroupType">
     <xsd:annotation>
       <xsd:documentation>
@@ -18,6 +21,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Allow" type="AllowType"/>
       <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
       <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
@@ -40,6 +44,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="AllowType" mixed="true">
@@ -50,6 +55,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Params" type="AuthorizedKeysParamsType"/>
     </xsd:choice>
     <xsd:attribute name="from" type="xsd:string">
@@ -75,6 +81,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="AuthorizedKeysParamsType">
@@ -85,6 +92,7 @@
         parameters.
       </xsd:documentation>
     </xsd:annotation>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
     <xsd:anyAttribute processContents="lax"/>
   </xsd:complexType>
 
@@ -96,10 +104,12 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Allow" type="AllowType"/>
         <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
         <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
       </xsd:choice>
+      <xsd:attributeGroup ref="py:genshiAttrs"/>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/fileprobes.xsd b/schemas/fileprobes.xsd
index 0dfb8cdd2..4fe168c98 100644
--- a/schemas/fileprobes.xsd
+++ b/schemas/fileprobes.xsd
@@ -6,25 +6,32 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="FileProbesGroupType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="FileProbe" type="FileProbeType"/>
       <xsd:element name="Group" type="FileProbesGroupType"/>
       <xsd:element name="Client" type="FileProbesGroupType"/>
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="negate"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="FileProbeType">
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="encoding"/>
     <xsd:attribute type="xsd:string" name="update"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="FileProbes">
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="FileProbe" type="FileProbeType"/>
         <xsd:element name="Group" type="FileProbesGroupType"/>
         <xsd:element name="Client" type="FileProbesGroupType"/>
diff --git a/schemas/nagiosgen.xsd b/schemas/nagiosgen.xsd
index 99d6b91c6..0ef1fb064 100644
--- a/schemas/nagiosgen.xsd
+++ b/schemas/nagiosgen.xsd
@@ -6,23 +6,31 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="NagiosGenGroupType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Option" type="OptionType"/>
       <xsd:element name="Group" type="NagiosGenGroupType"/>
       <xsd:element name="Client" type="NagiosGenGroupType"/>
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:string" name="negate"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="OptionType" mixed="true">
     <xsd:attribute type="xsd:string" name="name" use="required"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="NagiosGen">
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
+        <xsd:element name="Option" type="OptionType"/>
         <xsd:element name="Group" type="NagiosGenGroupType"/>
         <xsd:element name="Client" type="NagiosGenGroupType"/>
       </xsd:choice>
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index dbee2f31b..948402ca5 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -8,6 +8,8 @@
 
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="xml.xsd"/>
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
 
   <xsd:simpleType name="SourceTypeEnum">
     <xsd:restriction base="xsd:string">
@@ -40,6 +42,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
     <xsd:anyAttribute processContents="lax">
       <xsd:annotation>
         <xsd:documentation>
@@ -58,6 +61,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Component" type="xsd:string">
         <xsd:annotation>
           <xsd:documentation>
@@ -107,6 +111,7 @@
         </xsd:annotation>
       </xsd:element>
       <xsd:choice>
+      <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Blacklist" type="xsd:string">
           <xsd:annotation>
             <xsd:documentation>
@@ -202,10 +207,12 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="PackagesGroupType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Group" type="PackagesGroupType"/>
       <xsd:element name="Client" type="PackagesGroupType"/>
       <xsd:element name="Sources" type="SourcesType"/>
@@ -213,16 +220,19 @@
     </xsd:choice>
     <xsd:attribute type="xsd:string" name="name" use="required"/>
     <xsd:attribute type="xsd:boolean" name="negate"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="SourcesType">
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Group" type="PackagesGroupType"/>
       <xsd:element name="Client" type="PackagesGroupType"/>
       <xsd:element name="Source" type="SourceType"/>
       <xsd:element name="Sources" type="SourcesType"/>
     </xsd:choice>
     <xsd:attribute ref="xml:base"/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="Sources" type="SourcesType"/>
diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index f6de534c1..9446d5777 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:include schemaLocation="types.xsd"/>
 
   <xsd:complexType name="PrivateKeyGroupType">
@@ -19,6 +22,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Passphrase" type="PassphraseType"/>
       <xsd:element name="Params" type="PrivateKeyParamsType"/>
       <xsd:element name="Group" type="PrivateKeyGroupType"/>
@@ -42,6 +46,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:simpleType name="PrivateKeyTypeEnum">
@@ -74,6 +79,7 @@
         </xsd:attribute>
       </xsd:extension>
     </xsd:simpleContent>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="PrivateKeyParamsType">
@@ -97,6 +103,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="PrivateKey">
@@ -107,6 +114,7 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Passphrase" type="PassphraseType"/>
         <xsd:element name="Params" type="PrivateKeyParamsType"/>
         <xsd:element name="Group" type="PrivateKeyGroupType"/>
@@ -150,6 +158,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attributeGroup ref="py:genshiAttrs"/>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/schemas/pubkey.xsd b/schemas/pubkey.xsd
index 5671a818d..38d47ed0a 100644
--- a/schemas/pubkey.xsd
+++ b/schemas/pubkey.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:element name="PublicKey">
     <xsd:annotation>
       <xsd:documentation>
diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd
index a9c01fb29..97e258d78 100644
--- a/schemas/sslca-cert.xsd
+++ b/schemas/sslca-cert.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="SSLCACertGroupType">
     <xsd:annotation>
       <xsd:documentation>
@@ -17,6 +20,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Cert" type="CertType"/>
       <xsd:element name="Group" type="SSLCACertGroupType"/>
       <xsd:element name="Client" type="SSLCACertGroupType"/>
@@ -40,6 +44,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:simpleType name="SSLCACertFormatEnum">
@@ -147,6 +152,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="CertInfo">
@@ -157,6 +163,7 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Cert" type="CertType"/>
         <xsd:element name="Group" type="SSLCACertGroupType"/>
         <xsd:element name="Client" type="SSLCACertGroupType"/>
diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd
index efd4abd58..844304908 100644
--- a/schemas/sslca-key.xsd
+++ b/schemas/sslca-key.xsd
@@ -5,6 +5,9 @@
     </xsd:documentation>
   </xsd:annotation>
 
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
   <xsd:complexType name="SSLCAKeyGroupType">
     <xsd:annotation>
       <xsd:documentation>
@@ -17,6 +20,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Key" type="KeyType"/>
       <xsd:element name="Group" type="SSLCAKeyGroupType"/>
       <xsd:element name="Client" type="SSLCAKeyGroupType"/>
@@ -39,6 +43,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:simpleType name="KeyTypeEnum">
@@ -68,6 +73,7 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:element name="KeyInfo">
@@ -78,6 +84,7 @@
     </xsd:annotation>
     <xsd:complexType>
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
+        <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Key" type="KeyType"/>
         <xsd:element name="Group" type="SSLCAKeyGroupType"/>
         <xsd:element name="Client" type="SSLCAKeyGroupType"/>
-- 
cgit v1.2.3-1-g7c22


From 1f6cb52d0c43f842766f3ecd6c8286f0f4eed5c2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 16:20:46 -0500
Subject: Bundler: various changes

* Deprecated use of an explicit name attribute
* Deprecated .genshi bundles
* Minor restructuring for better performance
* bcfg2-lint updates
---
 schemas/authorizedkeys.xsd | 3 ++-
 schemas/bundle.xsd         | 7 ++++---
 schemas/fileprobes.xsd     | 3 ++-
 schemas/nagiosgen.xsd      | 3 ++-
 schemas/packages.xsd       | 3 ++-
 schemas/privkey.xsd        | 5 +++--
 schemas/pubkey.xsd         | 3 ++-
 schemas/sslca-cert.xsd     | 3 ++-
 schemas/sslca-key.xsd      | 3 ++-
 9 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'schemas')

diff --git a/schemas/authorizedkeys.xsd b/schemas/authorizedkeys.xsd
index ca238d492..b0495c242 100644
--- a/schemas/authorizedkeys.xsd
+++ b/schemas/authorizedkeys.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       Schema for :ref:`server-plugins-generators-cfg-sshkeys`
diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 863e10b4b..1b997ede3 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -256,11 +256,12 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
-    <xsd:attribute type='xsd:string' name='name' use='required'>
+    <xsd:attribute type='xsd:string' name='name'>
       <xsd:annotation>
         <xsd:documentation>
-          The name of the bundle.  This must match the bundle
-          filename, minus the extension.
+          The name of the bundle.  If present, this must match the
+          bundle filename, minus the extension.  Specifying the name
+          explicitly is deprecated.
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
diff --git a/schemas/fileprobes.xsd b/schemas/fileprobes.xsd
index 4fe168c98..12f60378c 100644
--- a/schemas/fileprobes.xsd
+++ b/schemas/fileprobes.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       FileProbes plugin config schema for bcfg2
diff --git a/schemas/nagiosgen.xsd b/schemas/nagiosgen.xsd
index 0ef1fb064..b3ccf5095 100644
--- a/schemas/nagiosgen.xsd
+++ b/schemas/nagiosgen.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       NagiosGen config schema for bcfg2
diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index 948402ca5..9e7489d51 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       packages config schema for bcfg2
diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index 9446d5777..392f28e97 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       Schema for :ref:`server-plugins-generators-cfg-sshkeys` ``privkey.xml``
@@ -77,9 +78,9 @@
             </xsd:documentation>
           </xsd:annotation>
         </xsd:attribute>
+        <xsd:attributeGroup ref="py:genshiAttrs"/>
       </xsd:extension>
     </xsd:simpleContent>
-    <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
   <xsd:complexType name="PrivateKeyParamsType">
diff --git a/schemas/pubkey.xsd b/schemas/pubkey.xsd
index 38d47ed0a..f3ffc7f44 100644
--- a/schemas/pubkey.xsd
+++ b/schemas/pubkey.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       Schema for :ref:`server-plugins-generators-cfg-sshkeys` ``pubkey.xml``
diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd
index 97e258d78..99fb2be99 100644
--- a/schemas/sslca-cert.xsd
+++ b/schemas/sslca-cert.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       Schema for :ref:`server-plugins-generators-sslca` ``cert.xml``
diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd
index 844304908..021da275c 100644
--- a/schemas/sslca-key.xsd
+++ b/schemas/sslca-key.xsd
@@ -1,4 +1,5 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
   <xsd:annotation>
     <xsd:documentation>
       Schema for :ref:`server-plugins-generators-sslca` ``key.xml``
-- 
cgit v1.2.3-1-g7c22


From f05d66c4858f9757b1a372f0a5de2c956c058f00 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 5 Feb 2013 08:58:41 -0500
Subject: Decisions: use StructFile instead of host- or group-specific XML
 files

---
 schemas/decisions.xsd | 77 +++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 14 deletions(-)

(limited to 'schemas')

diff --git a/schemas/decisions.xsd b/schemas/decisions.xsd
index 30115b367..c87d2a984 100644
--- a/schemas/decisions.xsd
+++ b/schemas/decisions.xsd
@@ -1,5 +1,6 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-  
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
+
   <xsd:annotation>
     <xsd:documentation>
       decision list schema for bcfg2
@@ -7,16 +8,64 @@
     </xsd:documentation>
   </xsd:annotation>
 
-  <xsd:element name='Decisions'>
-    <xsd:complexType>
-      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-        <xsd:element name='Decision'>
-          <xsd:complexType>
-            <xsd:attribute name='type' type='xsd:string' use='required'/>
-            <xsd:attribute name='name' type='xsd:string' use='required'/>
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
+  <xsd:complexType name="DecisionsGroupType">
+    <xsd:annotation>
+      <xsd:documentation>
+        A **DecisionsGroupType** is a tag used to provide logic.
+        Child entries of a DecisionsGroupType tag only apply to
+        machines that match the condition specified -- either
+        membership in a group, or a matching client name.
+        :xml:attribute:`DecisionsGroupType:negate` can be set to
+        negate the sense of the match.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="Decisions" type="DecisionsType"/>
+      <xsd:element name="Decision" type="DecisionType"/>
+      <xsd:element name="Group" type="DecisionsGroupType"/>
+      <xsd:element name="Client" type="DecisionsGroupType"/>
+      <xsd:group ref="py:genshiElements"/>
+    </xsd:choice>
+    <xsd:attribute name='name' type='xsd:string'>
+      <xsd:annotation>
+        <xsd:documentation>
+          The name of the client or group to match on.  Child entries
+          will only apply to this client or group (unless
+          :xml:attribute:`DecisionsGroupType:negate` is set).
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name='negate' type='xsd:boolean'>
+      <xsd:annotation>
+        <xsd:documentation>
+          Negate the sense of the match, so that child entries only
+          apply to a client if it is not a member of the given group
+          or does not have the given name.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="DecisionType">
+    <xsd:attribute name='type' type='xsd:string' use='required'/>
+    <xsd:attribute name='name' type='xsd:string' use='required'/>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="DecisionsType">
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:element name="Decisions" type="DecisionsType"/>
+      <xsd:element name="Decision" type="DecisionType"/>
+      <xsd:element name="Group" type="DecisionsGroupType"/>
+      <xsd:element name="Client" type="DecisionsGroupType"/>
+      <xsd:group ref="py:genshiElements"/>
+    </xsd:choice>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
+  </xsd:complexType>
+
+  <xsd:element name='Decisions' type="DecisionsType"/>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22


From 906b38cf27bad87b78b457f86db46e6cae5384b7 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 5 Feb 2013 08:59:30 -0500
Subject: misc. schema and schema doc fixes

---
 schemas/packages.xsd | 1 -
 schemas/privkey.xsd  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'schemas')

diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index 9e7489d51..2645a8be0 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -112,7 +112,6 @@
         </xsd:annotation>
       </xsd:element>
       <xsd:choice>
-      <xsd:group ref="py:genshiElements"/>
         <xsd:element name="Blacklist" type="xsd:string">
           <xsd:annotation>
             <xsd:documentation>
diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd
index 392f28e97..cf53904f0 100644
--- a/schemas/privkey.xsd
+++ b/schemas/privkey.xsd
@@ -14,7 +14,7 @@
   <xsd:complexType name="PrivateKeyGroupType">
     <xsd:annotation>
       <xsd:documentation>
-        An **PrivateKeyGroupType** is a tag used to provide logic.
+        A **PrivateKeyGroupType** is a tag used to provide logic.
         Child entries of a PrivateKeyGroupType tag only apply to
         machines that match the condition specified -- either
         membership in a group, or a matching client name.
-- 
cgit v1.2.3-1-g7c22


From 7db65d41386768a5081c34c16db17e82b96a5b7a Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 7 Feb 2013 08:26:39 -0500
Subject: made XInlcude and Encryption support more consistent

---
 schemas/authorizedkeys.xsd | 24 +++++++++++++-----------
 schemas/info.xsd           | 22 ++++++++++++----------
 schemas/sslca-cert.xsd     | 24 +++++++++++++-----------
 schemas/sslca-key.xsd      | 22 ++++++++++++----------
 4 files changed, 50 insertions(+), 42 deletions(-)

(limited to 'schemas')

diff --git a/schemas/authorizedkeys.xsd b/schemas/authorizedkeys.xsd
index b0495c242..fd8f2a7a3 100644
--- a/schemas/authorizedkeys.xsd
+++ b/schemas/authorizedkeys.xsd
@@ -26,6 +26,7 @@
       <xsd:element name="Allow" type="AllowType"/>
       <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
       <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
+      <xsd:element name="AuthorizedKeys" type="AuthorizedKeysType"/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'>
       <xsd:annotation>
@@ -97,20 +98,21 @@
     <xsd:anyAttribute processContents="lax"/>
   </xsd:complexType>
 
-  <xsd:element name="AuthorizedKeys">
+  <xsd:complexType name="AuthorizedKeysType">
     <xsd:annotation>
       <xsd:documentation>
         Top-level tag for describing a generated SSH key pair.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:complexType>
-      <xsd:choice minOccurs="1" maxOccurs="unbounded">
-        <xsd:group ref="py:genshiElements"/>
-        <xsd:element name="Allow" type="AllowType"/>
-        <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
-        <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
-      </xsd:choice>
-      <xsd:attributeGroup ref="py:genshiAttrs"/>
-    </xsd:complexType>
-  </xsd:element>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
+      <xsd:element name="Allow" type="AllowType"/>
+      <xsd:element name="Group" type="AuthorizedKeysGroupType"/>
+      <xsd:element name="Client" type="AuthorizedKeysGroupType"/>
+      <xsd:element name="AuthorizedKeys" type="AuthorizedKeysType"/>
+    </xsd:choice>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
+  </xsd:complexType>
+
+  <xsd:element name="AuthorizedKeys" type="AuthorizedKeysType"/>
 </xsd:schema>
diff --git a/schemas/info.xsd b/schemas/info.xsd
index 24538ffe3..9b898a168 100644
--- a/schemas/info.xsd
+++ b/schemas/info.xsd
@@ -92,6 +92,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs='1' maxOccurs='1'>
+      <xsd:element name='FileInfo' type="FileInfoType"/>
       <xsd:element name='Info' type='InfoType'/>
       <xsd:element name='Group' type='InfoGroupType' minOccurs='0'
                    maxOccurs='unbounded'/>
@@ -121,19 +122,20 @@
     </xsd:attribute>
   </xsd:complexType>
 
-  <xsd:element name='FileInfo'>
+  <xsd:complexType name="FileInfoType">
     <xsd:annotation>
       <xsd:documentation>
         Top-level tag for ``info.xml``.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:complexType>
-      <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-        <xsd:element name='Group' type='InfoGroupType'/>
-        <xsd:element name='Client' type='InfoGroupType'/>
-        <xsd:element name='Path' type='InfoGroupType'/>
-        <xsd:element name='Info' type='InfoType'/>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+    <xsd:choice minOccurs='0' maxOccurs='unbounded'>
+      <xsd:element name='FileInfo' type="FileInfoType"/>
+      <xsd:element name='Group' type='InfoGroupType'/>
+      <xsd:element name='Client' type='InfoGroupType'/>
+      <xsd:element name='Path' type='InfoGroupType'/>
+      <xsd:element name='Info' type='InfoType'/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:element name='FileInfo' type="FileInfoType"/>
 </xsd:schema>
diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd
index 99fb2be99..49d821aaf 100644
--- a/schemas/sslca-cert.xsd
+++ b/schemas/sslca-cert.xsd
@@ -26,6 +26,7 @@
       <xsd:element name="Group" type="SSLCACertGroupType"/>
       <xsd:element name="Client" type="SSLCACertGroupType"/>
       <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
+      <xsd:element name="CertInfo" type="CertInfoType"/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'>
       <xsd:annotation>
@@ -156,20 +157,21 @@
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
-  <xsd:element name="CertInfo">
+  <xsd:complexType name="CertInfoType">
     <xsd:annotation>
       <xsd:documentation>
         Top-level tag for describing an SSLCA generated certificate.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:complexType>
-      <xsd:choice minOccurs="1" maxOccurs="unbounded">
-        <xsd:group ref="py:genshiElements"/>
-        <xsd:element name="Cert" type="CertType"/>
-        <xsd:element name="Group" type="SSLCACertGroupType"/>
-        <xsd:element name="Client" type="SSLCACertGroupType"/>
-        <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
+      <xsd:element name="Cert" type="CertType"/>
+      <xsd:element name="Group" type="SSLCACertGroupType"/>
+      <xsd:element name="Client" type="SSLCACertGroupType"/>
+      <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
+      <xsd:element name="CertInfo" type="CertInfoType"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:element name="CertInfo" type="CertInfoType"/>
 </xsd:schema>
diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd
index 021da275c..2b6a02b98 100644
--- a/schemas/sslca-key.xsd
+++ b/schemas/sslca-key.xsd
@@ -25,6 +25,7 @@
       <xsd:element name="Key" type="KeyType"/>
       <xsd:element name="Group" type="SSLCAKeyGroupType"/>
       <xsd:element name="Client" type="SSLCAKeyGroupType"/>
+      <xsd:element name="KeyInfo" type="KeyInfoType"/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'>
       <xsd:annotation>
@@ -77,19 +78,20 @@
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
-  <xsd:element name="KeyInfo">
+  <xsd:complexType name="KeyInfoType">
     <xsd:annotation>
       <xsd:documentation>
         Top-level tag for describing an SSLCA generated key.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:complexType>
-      <xsd:choice minOccurs="1" maxOccurs="unbounded">
-        <xsd:group ref="py:genshiElements"/>
-        <xsd:element name="Key" type="KeyType"/>
-        <xsd:element name="Group" type="SSLCAKeyGroupType"/>
-        <xsd:element name="Client" type="SSLCAKeyGroupType"/>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
+      <xsd:element name="Key" type="KeyType"/>
+      <xsd:element name="Group" type="SSLCAKeyGroupType"/>
+      <xsd:element name="Client" type="SSLCAKeyGroupType"/>
+      <xsd:element name="KeyInfo" type="KeyInfoType"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:element name="KeyInfo" type="KeyInfoType"/>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22


From 398be2c5cb613d9506e0c115510c1b55881ca64e Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 8 Feb 2013 13:43:40 -0500
Subject: Bundler: added support for independent bundles

---
 schemas/bundle.xsd | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'schemas')

diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd
index 1b997ede3..e180d265a 100644
--- a/schemas/bundle.xsd
+++ b/schemas/bundle.xsd
@@ -256,12 +256,22 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type='xsd:boolean' name='independent'>
+      <xsd:annotation>
+        <xsd:documentation>
+          If set to ``true``, indicates that the bundle is a
+          collection of independent entries, and that service restarts
+          and modified actions should not be performed.  See
+          :ref:`server-plugins-structures-bundler-magic` for more.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attribute type='xsd:string' name='name'>
       <xsd:annotation>
         <xsd:documentation>
-          The name of the bundle.  If present, this must match the
-          bundle filename, minus the extension.  Specifying the name
-          explicitly is deprecated.
+          **Deprecated.** The name of the bundle.  If present, this
+          must match the bundle filename, minus the extension.
+          Specifying the name explicitly is deprecated.
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
-- 
cgit v1.2.3-1-g7c22


From 1ce53cdcd4803d4b0c3c9440ec352addf534bd67 Mon Sep 17 00:00:00 2001
From: Matt Schwager <schwag09@gmail.com>
Date: Wed, 10 Oct 2012 10:17:46 -0400
Subject: Added access control list's XML schema

---
 schemas/acl.xsd | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 schemas/acl.xsd

(limited to 'schemas')

diff --git a/schemas/acl.xsd b/schemas/acl.xsd
new file mode 100644
index 000000000..af0d8e318
--- /dev/null
+++ b/schemas/acl.xsd
@@ -0,0 +1,20 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+  <xsd:annotation>
+    <xsd:documentation>
+      acl config schema for bcfg2
+	  Matt Schwager
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="xml.xsd"/>
+
+  <xsd:complexType name="IPs">
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="IP" type="xsd:string" minOccurs="1"
+                   maxOccurs="unbounded"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+</xsd:schema>
-- 
cgit v1.2.3-1-g7c22


From 0253b04b9ba7c3e4ef139bf352b7a57de823daaa Mon Sep 17 00:00:00 2001
From: Matt Schwager <schwag09@gmail.com>
Date: Fri, 19 Oct 2012 13:37:49 -0400
Subject: Added CIDR notation to IP ACLs. Still need to test.

---
 schemas/acl.xsd | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'schemas')

diff --git a/schemas/acl.xsd b/schemas/acl.xsd
index af0d8e318..0c3e3ecdd 100644
--- a/schemas/acl.xsd
+++ b/schemas/acl.xsd
@@ -14,6 +14,8 @@
     <xsd:choice minOccurs="1" maxOccurs="unbounded">
       <xsd:element name="IP" type="xsd:string" minOccurs="1"
                    maxOccurs="unbounded"/>
+      <xsd:element name="CIDR" type="xsd:string" minOccurs="0"
+                   maxOccurs="unbounded"/>
     </xsd:choice>
   </xsd:complexType>
 
-- 
cgit v1.2.3-1-g7c22


From 5363e6d9a53146333da0d109aae170befc1b9481 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 12 Feb 2013 07:48:33 -0500
Subject: Added client ACLs:

* IP and CIDR-based ACLs
* Metadata (group/hostname)-based ACLs
* Documentation
* Unit tests
---
 schemas/acl-ip.xsd       | 56 ++++++++++++++++++++++++++++++++++
 schemas/acl-metadata.xsd | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 schemas/acl-ip.xsd
 create mode 100644 schemas/acl-metadata.xsd

(limited to 'schemas')

diff --git a/schemas/acl-ip.xsd b/schemas/acl-ip.xsd
new file mode 100644
index 000000000..1d6106c05
--- /dev/null
+++ b/schemas/acl-ip.xsd
@@ -0,0 +1,56 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+  <xsd:annotation>
+    <xsd:documentation>
+      Schema for IP-based client ACLs:
+      :ref:`server-plugins-misc-acl` ``ip.xml``
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:complexType name="IPACLType">
+    <xsd:attribute type="xsd:string" name="method" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+          The name of the XML-RPC method to allow or deny.  Limited
+          wildcards are supported.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute type="xsd:string" name="address">
+      <xsd:annotation>
+        <xsd:documentation>
+          The IP address to match against.  This is an exact match
+          unless :xml:attribute:`IPACLType:netmask` is defined.  If
+          this is not defined, all addresses match the given rule.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute type="xsd:string" name="netmask">
+      <xsd:annotation>
+        <xsd:documentation>
+          If this is defined, then it is combined with
+          :xml:attribute:`IPACLType:address` to produce a CIDR range,
+          which is used for matching instead of exact matching based
+          only on IP address.  This can be either an integer netmask
+          (e.g., ``netmask="24"``) or a dotted-quad (e.g.,
+          ``netmask="255.255.255.0"``).
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+
+  <xsd:complexType name="IPACLContainerType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Top-level tag for describing metadata-based client ACLs.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:element name="Allow" type="IPACLType"/>
+      <xsd:element name="Deny" type="IPACLType"/>
+      <xsd:element name="Defer" type="IPACLType"/>
+      <xsd:element name="ACL" type="IPACLContainerType"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:element name="ACL" type="IPACLContainerType"/>
+</xsd:schema>
diff --git a/schemas/acl-metadata.xsd b/schemas/acl-metadata.xsd
new file mode 100644
index 000000000..7d996fb87
--- /dev/null
+++ b/schemas/acl-metadata.xsd
@@ -0,0 +1,79 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:py="http://genshi.edgewall.org/" xml:lang="en">
+  <xsd:annotation>
+    <xsd:documentation>
+      Schema for metadata-based client ACLs:
+      :ref:`server-plugins-misc-acl` ``metadata.xml``
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:import namespace="http://genshi.edgewall.org/"
+              schemaLocation="genshi.xsd"/>
+
+  <xsd:complexType name="MetadataACLGroupType">
+    <xsd:annotation>
+      <xsd:documentation>
+        An **MetadataACLGroupType** is a tag used to provide logic.
+        Child entries of a MetadataACLGroupType tag only apply to
+        machines that match the condition specified -- either
+        membership in a group, or a matching client name.
+        :xml:attribute:`MetadataACLGroupType:negate` can be set to
+        negate the sense of the match.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:group ref="MetadataACLElements"/>
+    <xsd:attribute name='name' type='xsd:string'>
+      <xsd:annotation>
+        <xsd:documentation>
+          The name of the client or group to match on.  Child entries
+          will only apply to this client or group (unless
+          :xml:attribute:`MetadataACLGroupType:negate` is set).
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name='negate' type='xsd:boolean'>
+      <xsd:annotation>
+        <xsd:documentation>
+          Negate the sense of the match, so that child entries only
+          apply to a client if it is not a member of the given group
+          or does not have the given name.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="MetadataACLType">
+    <xsd:attribute type="xsd:string" name="method" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+          The name of the XML-RPC method to allow or deny.  Limited
+          wildcards are supported.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="py:genshiAttrs"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="MetadataACLContainerType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Top-level tag for describing metadata-based client ACLs.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:group ref="MetadataACLElements"/>
+  </xsd:complexType>
+
+  <xsd:group name="MetadataACLElements">
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
+      <xsd:element name="Allow" type="MetadataACLType"/>
+      <xsd:element name="Deny" type="MetadataACLType"/>
+      <xsd:element name="Group" type="MetadataACLGroupType"/>
+      <xsd:element name="Client" type="MetadataACLGroupType"/>
+      <xsd:element name="ACL" type="MetadataACLContainerType"/>
+    </xsd:choice>
+  </xsd:group>
+
+  <xsd:element name="ACL" type="MetadataACLContainerType"/>
+</xsd:schema>
-- 
cgit v1.2.3-1-g7c22


From 088ca5fee4cc99f9143f18a880cdec6712326e1e Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 12 Feb 2013 09:47:04 -0500
Subject: fixed unit tests

---
 schemas/acl-metadata.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'schemas')

diff --git a/schemas/acl-metadata.xsd b/schemas/acl-metadata.xsd
index 7d996fb87..68994c940 100644
--- a/schemas/acl-metadata.xsd
+++ b/schemas/acl-metadata.xsd
@@ -21,7 +21,7 @@
         negate the sense of the match.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:group ref="MetadataACLElements"/>
+    <xsd:group ref="MetadataACLElements" minOccurs="1" maxOccurs="unbounded"/>
     <xsd:attribute name='name' type='xsd:string'>
       <xsd:annotation>
         <xsd:documentation>
@@ -61,11 +61,11 @@
         Top-level tag for describing metadata-based client ACLs.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:group ref="MetadataACLElements"/>
+    <xsd:group ref="MetadataACLElements" minOccurs="1" maxOccurs="unbounded"/>
   </xsd:complexType>
 
   <xsd:group name="MetadataACLElements">
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+    <xsd:choice>
       <xsd:group ref="py:genshiElements"/>
       <xsd:element name="Allow" type="MetadataACLType"/>
       <xsd:element name="Deny" type="MetadataACLType"/>
-- 
cgit v1.2.3-1-g7c22