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

Update htpasswd module for various API incompatibilities

Browse source
This commit is contained in:
Michael DeHaan 2013-07-20 18:22:58 -04:00
parent e003f1e1cc
commit 508c1d8256
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
library/web_infrastructure/htpasswd
View file

@ -92,17 +92,40 @@ def present(dest, username, password, create, check_mode):
if check_mode:
return ("Create %s" % dest, True)
create_missing_directories(dest)
ht = HtpasswdFile(dest, new=True)
ht.set_password(username, password)
try:
ht = HtpasswdFile(dest, new=True)
except:
# library version doesn't take 'new', deal with it.
fh = open(dest, 'w')
fh.write('')
fh.close()
ht = HtpasswdFile(dest)
if getattr(ht, 'set_password', None):
ht.set_password(username, password)
else:
ht.update(username, password)
ht.save()
return ("Created %s and added %s" % (dest, username), True)
else:
ht = HtpasswdFile(dest, new=False)
if ht.check_password(username, password):
try:
ht = HtpasswdFile(dest, new=False)
except:
ht = HtpasswdFile(dest)
found = None
if getattr(ht, 'check_password', None):
found = ht.check_password(username, password)
else:
found = ht.verify(username, password)
if found:
return ("%s already present" % username, False)
else:
if not check_mode:
ht.set_password(username, password)
if getattr(ht, 'set_password', None):
ht.set_password(username, password)
else:
ht.update(username, password)
ht.save()
return ("Add/update %s" % username, True)
@ -114,7 +137,11 @@ def absent(dest, username, check_mode):
if not os.path.exists(dest):
raise ValueError("%s does not exists" % dest)
ht = HtpasswdFile(dest, new=False)
try:
ht = HtpasswdFile(dest, new=False)
except:
ht = HtpasswdFile(dest)
if username not in ht.users():
return ("%s not present" % username, False)
else: