Merge branch '__acl_source_parameter' into 'master'

__acl: add --source

See merge request ungleich-public/cdist!835
This commit is contained in:
poljakowski 2020-01-19 19:36:33 +01:00
commit 138a449008
3 changed files with 24 additions and 1 deletions

View File

@ -28,7 +28,17 @@ acl_path="/$__object_id"
acl_is="$( cat "$__object/explorer/acl_is" )"
if [ -f "$__object/parameter/entry" ]
if [ -f "$__object/parameter/source" ]
then
acl_source="$( cat "$__object/parameter/source" )"
if [ "$acl_source" = '-' ]
then
acl_should="$( cat "$__object/stdin" )"
else
acl_should="$( grep -Ev '^#|^$' "$acl_source" )"
fi
elif [ -f "$__object/parameter/entry" ]
then
acl_should="$( cat "$__object/parameter/entry" )"
elif [ -f "$__object/parameter/acl" ]

View File

@ -19,6 +19,14 @@ entry
Set ACL entry following ``getfacl`` output syntax.
OPTIONAL PARAMETERS
-------------------
source
Read ACL entries from stdin or file.
Ordering of entries is not important.
When reading from file, comments and empty lines are ignored.
BOOLEAN PARAMETERS
------------------
default
@ -71,6 +79,10 @@ EXAMPLES
--entry group:secret-project:rwx \
--entry user:alice:r-x
# read acl from stdin
echo 'user:alice:rwx' \
| __acl /path/to/directory --source -
AUTHORS
-------

View File

@ -1,2 +1,3 @@
mask
other
source