1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge branch 'apt_key_file' of git://github.com/veeti/ansible into devel

Conflicts:
	library/packaging/apt_key
This commit is contained in:
Michael DeHaan 2013-06-18 16:18:31 -04:00
commit b4358d1300

View file

@ -42,6 +42,11 @@ options:
default: none default: none
description: description:
- keyfile contents - keyfile contents
file:
required: false
default: none
description:
- keyfile path
url: url:
required: false required: false
default: none default: none
@ -67,6 +72,9 @@ EXAMPLES = '''
# Remove a Apt specific signing key # Remove a Apt specific signing key
- apt_key: id=473041FA state=absent - apt_key: id=473041FA state=absent
# Add a key from a file on the Ansible server
- apt_key: data="{{ lookup('file', 'apt.gpg') }}" state=present
''' '''
@ -121,9 +129,15 @@ def download_key(module, url):
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())
<<<<<<< HEAD
def add_key(module, key): def add_key(module, key):
cmd = "apt-key add -" cmd = "apt-key add -"
(rc, out, err) = module.run_command(cmd, data=key, check_rc=True, binary_data=True) (rc, out, err) = module.run_command(cmd, data=key, check_rc=True, binary_data=True)
=======
def add_key(module, key, data=None):
cmd = "apt-key add %s" % (key)
(rc, out, err) = module.run_command(cmd, data=data, check_rc=True)
>>>>>>> 77159d21da40f6fcb0bfdcb1886f57acf68ea4f4
return True return True
def remove_key(module, key_id): def remove_key(module, key_id):
@ -138,6 +152,7 @@ def main():
id=dict(required=False, default=None), id=dict(required=False, default=None),
url=dict(required=False), url=dict(required=False),
data=dict(required=False), data=dict(required=False),
file=dict(required=False),
key=dict(required=False), key=dict(required=False),
state=dict(required=False, choices=['present', 'absent'], default='present') state=dict(required=False, choices=['present', 'absent'], default='present')
), ),
@ -147,6 +162,7 @@ def main():
key_id = module.params['id'] key_id = module.params['id']
url = module.params['url'] url = module.params['url']
data = module.params['data'] data = module.params['data']
file = module.params['file']
state = module.params['state'] state = module.params['state']
changed = False changed = False
@ -160,14 +176,14 @@ 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 data: if not file and not data:
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)
else: else:
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)
add_key(module, data) add_key(module, (file if file else "-"), data)
changed=False changed=False
keys2 = all_keys(module) keys2 = all_keys(module)
if len(keys) != len(keys2): if len(keys) != len(keys2):