diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 09:20:37 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 09:20:37 -0500 |
| commit | ae58c24f72a8ed72327fbc3f7305bd69ec6a13db (patch) | |
| tree | e8614b54239161156d76424251cfc868643488a0 /schemas | |
| parent | 873a373c7eda0ba523ea8b78c3c45d7e8f189628 (diff) | |
| download | bcfg2-ae58c24f72a8ed72327fbc3f7305bd69ec6a13db.tar.gz bcfg2-ae58c24f72a8ed72327fbc3f7305bd69ec6a13db.tar.bz2 bcfg2-ae58c24f72a8ed72327fbc3f7305bd69ec6a13db.zip | |
Made a few encryption things simpler:
* Only one strict/lax setting, in [encryption], rather than separate
settings in [properties] and [sshkeys]
* No longer necessary to enable encryption on each Properties file
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/privkey.xsd | 17 | ||||
| -rw-r--r-- | schemas/types.xsd | 7 |
2 files changed, 24 insertions, 0 deletions
diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd index b8d9e317d..f6de534c1 100644 --- a/schemas/privkey.xsd +++ b/schemas/privkey.xsd @@ -5,6 +5,8 @@ </xsd:documentation> </xsd:annotation> + <xsd:include schemaLocation="types.xsd"/> + <xsd:complexType name="PrivateKeyGroupType"> <xsd:annotation> <xsd:documentation> @@ -133,6 +135,21 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="priority" type="xsd:positiveInteger" default="50"> + <xsd:annotation> + <xsd:documentation> + Create group-specific keys with the given priority. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="decrypt" type="EncryptStrictnessEnum"> + <xsd:annotation> + <xsd:documentation> + Override the global strict/lax decryption setting in + ``bcfg2.conf``. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:complexType> </xsd:element> </xsd:schema> diff --git a/schemas/types.xsd b/schemas/types.xsd index a6070279a..524b327c5 100644 --- a/schemas/types.xsd +++ b/schemas/types.xsd @@ -96,6 +96,13 @@ </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> |