* Added support for multi-line key files.

reviewable/pr18780/r1
Piffey Parlance 12 years ago
parent 46d0ba335c
commit cd55d3b6ab

@ -143,28 +143,32 @@ def enforce_state(module, params):
key = params["key"] key = params["key"]
state = params.get("state", "present") state = params.get("state", "present")
# If multiple keys split on the newline
if '\n' in key: if '\n' in key:
module.fail_json(msg="key= can only contain a single key") new_keys = key.split('\n')
# check current state -- just get the filename, don't create file # check current state -- just get the filename, don't create file
params["keyfile"] = keyfile(module, user, write=False) params["keyfile"] = keyfile(module, user, write=False)
keys = readkeys(params["keyfile"]) keys = readkeys(params["keyfile"])
present = key in keys
# Check our new keys, if any of them exist we'll continue.
for new_key in new_keys:
present = new_key in keys
# handle idempotent state=present # handle idempotent state=present
if state=="present": if state=="present":
if present: if present:
module.exit_json(changed=False) continue
keys.append(key) keys.append(new_key)
writekeys(module, keyfile(module, user,write=True), keys) writekeys(module, keyfile(module, user,write=True), keys)
params['changed'] = True
elif state=="absent": elif state=="absent":
if not present: if not present:
module.exit_json(changed=False) continue
keys.remove(key) keys.remove(new_key)
writekeys(module, keyfile(module, user,write=True), keys) writekeys(module, keyfile(module, user,write=True), keys)
params['changed'] = True params['changed'] = True
return params return params
def main(): def main():

Loading…
Cancel
Save