diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-04-14 09:22:26 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-04-14 09:22:26 -0500 |
| commit | 232476219e69afc14647892250bba08a3118a7e7 (patch) | |
| tree | 76c084cd361a89fe2fb378bb20a9aea0fa900baf /doc/appendix | |
| parent | dd8594eb5427610ade2f1f8abf465cde8c9568fd (diff) | |
| download | bcfg2-232476219e69afc14647892250bba08a3118a7e7.tar.gz bcfg2-232476219e69afc14647892250bba08a3118a7e7.tar.bz2 bcfg2-232476219e69afc14647892250bba08a3118a7e7.zip | |
doc: Fix some documentation issues (#980)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'doc/appendix')
| -rw-r--r-- | doc/appendix/guides/centos.txt | 8 | ||||
| -rw-r--r-- | doc/appendix/guides/converging_rhel5.txt | 2 | ||||
| -rw-r--r-- | doc/appendix/guides/fedora.txt | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/doc/appendix/guides/centos.txt b/doc/appendix/guides/centos.txt index d89d532ba..525cb5a98 100644 --- a/doc/appendix/guides/centos.txt +++ b/doc/appendix/guides/centos.txt @@ -431,7 +431,7 @@ packages. Currently, the way to manage them is using :ref:`BoundEntries .. code-block:: xml <Bundle name='base-packages'> - <BoundPackage name="gpg-pubkey" type="rpm"> + <BoundPackage name="gpg-pubkey" type="rpm" version="foo"> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/> </BoundPackage> @@ -452,6 +452,10 @@ packages. Currently, the way to manage them is using :ref:`BoundEntries <Package name='yum'/> </Bundle> +.. note:: + + version="foo" is just a dummy attribute for the gpg-pubkey Package + To actually push the gpg keys out via Bcfg2, you will need to manage the files as well. This can be done by adding Path entries for each of the gpg keys you want to manage @@ -461,7 +465,7 @@ gpg keys you want to manage <Bundle name='base-packages'> <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5'/> <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL'/> - <BoundPackage name="gpg-pubkey" type="rpm"> + <BoundPackage name="gpg-pubkey" type="rpm" version="foo"> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/> </BoundPackage> diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt index 7581d307f..d6a9d2d1c 100644 --- a/doc/appendix/guides/converging_rhel5.txt +++ b/doc/appendix/guides/converging_rhel5.txt @@ -81,7 +81,7 @@ For a "Package" <Bundle name='keys'> <!-- GPG keys --> - <BoundPackage name="gpg-pubkey" type="yum"> + <BoundPackage name="gpg-pubkey" type="rpm" version="foo"> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release" version="37017186" release="45761324"/> </BoundPackage> diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt index 4e3244eaa..12432b04f 100644 --- a/doc/appendix/guides/fedora.txt +++ b/doc/appendix/guides/fedora.txt @@ -339,7 +339,7 @@ Bundle now looks like this .. code-block:: xml <Bundle name='base-packages'> - <BoundPackage name="gpg-pubkey" type="rpm"> + <BoundPackage name="gpg-pubkey" type="rpm" version="foo"> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/> </BoundPackage> @@ -360,6 +360,10 @@ Bundle now looks like this <Package name='yum'/> </Bundle> +.. note:: + + version="foo" is just a dummy attribute for the gpg-pubkey Package + To actually push the gpg keys out via Bcfg2, you will need to manage the files as well. This can be done by adding Path entries for each of the gpg keys you want to manage @@ -369,7 +373,7 @@ of the gpg keys you want to manage <Bundle name='base-packages'> <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5'/> <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL'/> - <BoundPackage name="gpg-pubkey" type="rpm"> + <BoundPackage name="gpg-pubkey" type="rpm" version="foo"> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/> <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/> </BoundPackage> |