cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes ansible/ansible#523. Removed 'with:' blocks so module works with Python 2.4 for CentOS 5 support, courtesy of mcodd/ansible@29af24b732.

Browse source
This commit is contained in:
Brad Olson 2012-07-02 17:57:38 +00:00
parent 9714f5c79d
commit 756df550f8
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
library/authorized_key
View file

@ -75,8 +75,12 @@ def get_params():
global msg global msg
msg = "reading params" msg = "reading params"
with file(sys.argv[1]) as f: #read the args file argfile = sys.argv[1]
try:
f = open(argfile,"r")
args = f.read() args = f.read()
finally:
f.close()
msg = "writing syslog." msg = "writing syslog."
syslog.openlog('ansible-%s' % os.path.basename(__file__)) syslog.openlog('ansible-%s' % os.path.basename(__file__))
@ -118,8 +122,11 @@ def keyfile(user, create=False):
os.chmod(sshdir, 0700) os.chmod(sshdir, 0700)
msg = "Touching authorized keys file." msg = "Touching authorized keys file."
if not exists( keysfile): if not exists( keysfile):
with file(keysfile, "w") as f: try:
f.write("#Authorized Keys File created by Ansible.") f = open(keysfile, "w")
f.write("#Authorized Keys File created by Ansible.\n")
finally:
f.close()
os.chown(keysfile, uid, gid) os.chown(keysfile, uid, gid)
os.chmod(keysfile, 0600) os.chmod(keysfile, 0600)
return keysfile return keysfile
@ -128,15 +135,21 @@ def readkeys( filename):
global msg global msg
msg = "Reading authorized_keys." msg = "Reading authorized_keys."
if not isfile(filename): return [] if not isfile(filename): return []
with file(filename) as f: try:
f = open(filename)
keys = [line.rstrip() for line in f.readlines()] keys = [line.rstrip() for line in f.readlines()]
finally:
f.close()
return keys return keys
def writekeys( filename, keys): def writekeys( filename, keys):
global msg global msg
msg = "Writing authorized_keys." msg = "Writing authorized_keys."
with file(filename,"w") as f: try:
f = open(filename,"w")
f.writelines( (key + "\n" for key in keys) ) f.writelines( (key + "\n" for key in keys) )
finally:
f.close()
def enforce_state( params): def enforce_state( params):
"""Add or remove key. """Add or remove key.
@ -153,7 +166,7 @@ def enforce_state( params):
state = params.get("state", "present") state = params.get("state", "present")
#== check current state #== check current state
params["keyfile"] = keyfile(user) params["keyfile"] = keyfile(user,create=True)
keys = readkeys( params["keyfile"]) keys = readkeys( params["keyfile"])
present = key in keys present = key in keys