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

Merge pull request #6515 from lotia/fix-acl-doc-and-error

Browse source 
Fix acl doc and error
This commit is contained in:
Michael DeHaan 2014-03-16 13:15:42 -05:00
commit 7286beb15e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/files/acl
View file

@ -95,7 +95,7 @@ EXAMPLES = '''
- acl: name=/etc/foo.d entity=joe etype=user permissions=rw default=yes state=present - acl: name=/etc/foo.d entity=joe etype=user permissions=rw default=yes state=present
# Same as previous but using entry shorthand # Same as previous but using entry shorthand
- acl: name=/etc/foo.d entrty="default:user:joe:rw-" state=present - acl: name=/etc/foo.d entry="default:user:joe:rw-" state=present
# Obtain the acl for a specific file # Obtain the acl for a specific file
- acl: name=/etc/foo.conf - acl: name=/etc/foo.conf
@ -218,10 +218,10 @@ def main():
if state in ['present','absent']: if state in ['present','absent']:
if not entry and not etype: if not entry and not etype:
module.fail_json(msg="%s requries to have ither either etype and permissions or entry to be set" % state) module.fail_json(msg="%s requires either etype and permissions or just entry be set" % state)
if entry: if entry:
if etype or entity or permissions: if etype or entity or permissions:
module.fail_json(msg="entry and another incompatible field (entity, etype or permissions) are also set") module.fail_json(msg="entry and another incompatible field (entity, etype or permissions) are also set")
if entry.count(":") not in [2,3]: if entry.count(":") not in [2,3]:
module.fail_json(msg="Invalid entry: '%s', it requires 3 or 4 sections divided by ':'" % entry) module.fail_json(msg="Invalid entry: '%s', it requires 3 or 4 sections divided by ':'" % entry)