summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-04-10 17:00:36 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-04 11:08:20 -0400
commit9f31e17f1420dca584aed5b141fbc03eed284b48 (patch)
treee7d69717857d7c4b5a43353b93acce5289412f4a
parent39350ff2e9a82aaba2d315f2a656e52f18ae0921 (diff)
downloadbcfg2-9f31e17f1420dca584aed5b141fbc03eed284b48.tar.gz
bcfg2-9f31e17f1420dca584aed5b141fbc03eed284b48.tar.bz2
bcfg2-9f31e17f1420dca584aed5b141fbc03eed284b48.zip
merged b82a107... removed obsolete docs about import_gpg_keys
-rw-r--r--doc/server/plugins/generators/packages.txt17
1 files changed, 4 insertions, 13 deletions
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index 276b73093..900162aaa 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -51,7 +51,7 @@ member clients.
| Yum | yum | |
+--------+----------+--------------+
-.. note::
+.. note::
.. versionadded:: 1.2.0
@@ -567,7 +567,7 @@ You can also view the sources applicable to a client::
Type: yum
URL: http://mirror.example.com/centos-6-x86_64-updates
GPG Key(s): http://mirror.example.com/centos-6-x86_64-updates/RPM-GPG-KEY-CentOS-6
-
+
Name: centos-6-x86_64-os
Type: yum
URL: http://mirror.example.com/centos-6-x86_64-os
@@ -662,17 +662,8 @@ It understands the following directives:
* ``gpg_keypath``: The path on the client RPM GPG keys will be copied
to before they are imported on the client. Default is
"/etc/pki/rpm-gpg".
-* ``import_gpg_keys``: The RPM release of an RPM GPG key cannot be
- reliably and automatically determined without importing the key into
- the server's key chain. If ``import_gpg_keys`` is "false" (the
- default), the release of automatically-generated RPM GPG key entries
- in the specification will be set to "any", which disables
- verification of the release. (Version will still be verified.) In
- practice, this is unlikely to be an issue, as the RPM version of a
- GPG key is the key's fingerprint, and collisions are rare. If you
- do encounter a GPG key version collision, you will need to set this
- to "true", whereupon Packages will import the keys into the server's
- key chain. Python RPM libraries must be installed for this to work.
+* ``version``: Set the version attribute used when binding
+ Packages. Default is ``auto``.
[yum] section
-------------