wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support for apt-key keyserver parameter

Browse source
This commit is contained in:
Leszek Krupiński 2013-12-08 11:53:33 +01:00
parent fa8a02dcda
commit 4357e6f31e
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
library/packaging/apt_key
View file

@ -58,6 +58,11 @@ options:
default: none default: none
description: description:
- url to retrieve key from. - url to retrieve key from.
keyserver:
required: false
default: none
description:
- keyserver to retrieve key from.
state: state:
required: false required: false
choices: [ absent, present ] choices: [ absent, present ]
@ -141,6 +146,10 @@ def download_key(module, url):
except: except:
module.fail_json(msg="error getting key id from url", traceback=format_exc()) module.fail_json(msg="error getting key id from url", traceback=format_exc())
def import_key(module, keyserver, key_id):
cmd = "apt-key adv --keyserver %s --recv %s" % (keyserver, key_id)
(rc, out, err) = module.run_command(cmd, check_rc=True)
return True
def add_key(module, keyfile, keyring, data=None): def add_key(module, keyfile, keyring, data=None):
if data is not None: if data is not None:
@ -175,6 +184,7 @@ def main():
file=dict(required=False), file=dict(required=False),
key=dict(required=False), key=dict(required=False),
keyring=dict(required=False), keyring=dict(required=False),
keyserver=dict(required=False),
state=dict(required=False, choices=['present', 'absent'], default='present') state=dict(required=False, choices=['present', 'absent'], default='present')
), ),
supports_check_mode=True supports_check_mode=True
@ -186,6 +196,7 @@ def main():
filename = module.params['file'] filename = module.params['file']
keyring = module.params['keyring'] keyring = module.params['keyring']
state = module.params['state'] state = module.params['state']
keyserver = module.params['keyserver']
changed = False changed = False
if key_id: if key_id:
@ -206,7 +217,7 @@ def main():
if key_id and key_id in keys: if key_id and key_id in keys:
module.exit_json(changed=False) module.exit_json(changed=False)
else: else:
if not filename and not data: if not filename and not data and not keyserver:
data = download_key(module, url) data = download_key(module, url)
if key_id and key_id in keys: if key_id and key_id in keys:
module.exit_json(changed=False) module.exit_json(changed=False)
@ -215,6 +226,8 @@ def main():
module.exit_json(changed=True) module.exit_json(changed=True)
if filename: if filename:
add_key(module, filename, keyring) add_key(module, filename, keyring)
elif keyserver:
import_key(module, keyserver, key_id)
else: else:
add_key(module, "-", keyring, data) add_key(module, "-", keyring, data)
changed=False changed=False