diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-05-16 11:19:17 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-05-16 11:19:17 -0500 |
| commit | 1e2131e0e64557320f84fa98b7d0d1d022bd725e (patch) | |
| tree | c875ed8909058a0a8d29308e38229faba3267bf1 | |
| parent | 0168732743ea6ae76c65b32e7f91dc92582871b2 (diff) | |
| download | bcfg2-1e2131e0e64557320f84fa98b7d0d1d022bd725e.tar.gz bcfg2-1e2131e0e64557320f84fa98b7d0d1d022bd725e.tar.bz2 bcfg2-1e2131e0e64557320f84fa98b7d0d1d022bd725e.zip | |
doc: Better document PostInstall entries
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | doc/server/configurationentries.txt | 18 | ||||
| -rw-r--r-- | schemas/bundle.xsd | 9 | ||||
| -rw-r--r-- | schemas/rules.xsd | 5 |
3 files changed, 31 insertions, 1 deletions
diff --git a/doc/server/configurationentries.txt b/doc/server/configurationentries.txt index 5602da189..91aed99b6 100644 --- a/doc/server/configurationentries.txt +++ b/doc/server/configurationentries.txt @@ -34,6 +34,22 @@ Non-POSIX entries | Service | System Services | name, type, status, target | +-------------+---------------------+-----------------------------+ +.. note:: + + PostInstall entries are deprecated in favor of Action entries. In + fact, a PostInstall entry is simply a specific type of Action. + Basically, the following are equivalent:: + + .. code-block:: xml + + <PostInstall name='foo'/> + + and + + .. code-block:: xml + + <Action timing='post' when='modified' name='n' command='foo' status='ignore'/> + POSIX entries ============= @@ -48,7 +64,7 @@ will only contain a *name* attribute. The type will be added by the plugin that handles the entry in the case of `Cfg`_, `TGenshi`_, or `TCheetah`_. If the entry is handled by the `Rules`_ plugin (i.e. it is a device, directory, hardlink, symlink, etc), then you will specify both -the *type* and any other necessary attributes in `Rules`_. +the *type* and any other necessary attributes in `Rules`_. Running ``bcfg2-lint`` will check your configuration specification for the presence of any mandatory attributes that are necessary for the diff --git a/schemas/bundle.xsd b/schemas/bundle.xsd index b226e1078..c0a7e08ac 100644 --- a/schemas/bundle.xsd +++ b/schemas/bundle.xsd @@ -55,6 +55,15 @@ </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 bc8a4af80..101b62384 100644 --- a/schemas/rules.xsd +++ b/schemas/rules.xsd @@ -24,6 +24,10 @@ <xsd:attributeGroup ref="py:genshiAttrs"/> </xsd:complexType> + <xsd:complexType name='PostInstallType'> + <xsd:attribute type='xsd:string' name='name' use='required'/> + </xsd:complexType> + <xsd:complexType name='PathType'> <xsd:attribute type='PathTypeEnum' name='type' use='required'/> <xsd:attribute type='xsd:string' name='name' use='required'/> @@ -68,6 +72,7 @@ <xsd:element name='Package' type='PackageType'/> <xsd:element name='Path' type='PathType'/> <xsd:element name='Action' type='ActionType'/> + <xsd:element name='PostInstall' type='PostInstallType'/> <xsd:element name='Group' type='RContainerType'/> <xsd:element name='Client' type='RContainerType'/> <xsd:element ref="py:def"/> |