Commit graph

15 commits

Author SHA1 Message Date
Maykel Moya
a96f75c396 Do key validation only when key is provided
key_id is optional, the previous code didn't handle the case of key_id
not specified
2013-10-17 12:04:04 +02:00
Maykel Moya
5d41d2eaa4 apt_key: Validate key_id and accept a leading '0x' 2013-10-16 20:52:18 +02:00
Michael DeHaan
e1e37002c3 Add version_added to new parameter. 2013-08-03 14:22:38 -04:00
Alan Grosskurth
5700970e05 apt_key: Add 'keyring' parameter
The apt-key command takes an optional --keyring parameter representing
the path to a specific GPG keyring to operate on. If it's not given,
the command operates on all keyring files, i.e., /etc/apt/trusted.gpg
and /etc/apt/trusted.gpg.d/*.gpg.

This change adds a 'keyring' parameter to the apt_key module and
propagates it down to the apt-key command line. The main use case this
supports is organizing keys for third-party repos into individual
keyrings in /etc/apt/trusted.gpg.d, rather than putting them all in
the default keyring.
2013-07-24 18:10:17 -07:00
Michael DeHaan
3dc560a1a2 Fixup previous apt_key patch to enable file based modes to work. 2013-06-26 14:46:29 -04:00
Michael DeHaan
03f1578768 Merge conflict 2013-06-18 20:18:17 -04:00
Michael DeHaan
538a998d26 Merge branch 'apt_key_file' of git://github.com/veeti/ansible into devel
Conflicts:
	library/packaging/apt_key
2013-06-18 16:18:31 -04:00
Veeti Paananen
b53982f9d2 Add apt_key examples for file and data 2013-06-17 18:23:40 +03:00
Michael DeHaan
d91ffdef72 Merge pull request #3162 from strawlab/apt-key-binary-fix
allow apt-key module to work with binary key
2013-06-16 20:27:10 -07:00
Michael DeHaan
3a9f45d457 Merge pull request #3213 from veeti/apt_key_data
Document the data argument for apt_key
2013-06-16 19:39:55 -07:00
Jan-Piet Mens
3404a0fc16 DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)
Migrated all examples: in DOCUMENTATION=''' string to standalone EXAMPLES=''' string
  Added deprecation warning to moduledev.rst and remove deprecated example from it
  Fixed up a few typos and uppercased some acronyms.
  add consistency to how EXAMPLES are formatted
2013-06-15 20:54:25 +02:00
Veeti Paananen
e4c4f8ba7d Add a file argument to apt_key 2013-06-14 14:34:04 +03:00
Veeti Paananen
6a572f3607 Document the data argument for apt_key 2013-06-14 14:32:56 +03:00
Andrew Straw
7d9eb14b2a allow apt-key module to work with binary key 2013-06-09 20:03:28 +00:00
Michael DeHaan
cd97a4cb14 Allow modules to be categorized, and also sort them when generating the documentation. 2013-04-28 15:03:45 -04:00
Renamed from apt_key (Browse further)