diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
| commit | 69ebf49d54aac70a42142d0d04e562496bce58ea (patch) | |
| tree | ad0f346ff95a14ad49440128ff76d7e2b3f0816a /schemas | |
| parent | 602ba6af6bd1c9b3910940dee766660ab8e81a19 (diff) | |
| parent | e17e41dcff096ead7e129a0db063f75de44aaa2b (diff) | |
| download | bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.gz bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.bz2 bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.zip | |
Merge branch 'master' into 1.4.x
Conflicts:
doc/appendix/contributors.txt
schemas/bundle.xsd
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/Encryption.py
src/lib/Bcfg2/Server/Lint/Genshi.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/Decisions.py
src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
src/sbin/bcfg2-test
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
tools/bcfg2-profile-templates.py
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/bundle.xsd | 69 | ||||
| -rw-r--r-- | schemas/privkey.xsd | 7 |
2 files changed, 62 insertions, 14 deletions
diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index e180d265a..d5abf2d94 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -55,25 +55,80 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name='SELinux' type='SELinuxStructure'> + <xsd:element name='POSIXUser' type='StructureEntry'> <xsd:annotation> <xsd:documentation> - Abstract implementation of an SELinux entry. The - full specification will be included in Rules. + Abstract description of a POSIXUser entry. </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name='POSIXUser' type='StructureEntry'> + <xsd:element name='POSIXGroup' type='StructureEntry'> <xsd:annotation> <xsd:documentation> - Abstract description of a POSIXUser entry. + Abstract description of a POSIXGroup entry. </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name='POSIXGroup' type='StructureEntry'> + <xsd:element name='SEBoolean' type='SELinuxStructure'> <xsd:annotation> <xsd:documentation> - Abstract description of a POSIXGroup entry. + Abstract SELinux boolean entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SEPort' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux port entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SEFcontext' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux file context ("fcontext") entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SENode' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux node entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SELogin' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux login entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SEUser' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux user entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SEInterface' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux interface entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SEPermissive' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux permissive domain entry. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name='SEModule' type='SELinuxStructure'> + <xsd:annotation> + <xsd:documentation> + Abstract SELinux module entry. </xsd:documentation> </xsd:annotation> </xsd:element> diff --git a/schemas/privkey.xsd b/schemas/privkey.xsd index cf53904f0..0bb1b7184 100644 --- a/schemas/privkey.xsd +++ b/schemas/privkey.xsd @@ -144,13 +144,6 @@ </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> |