Merge branch 'master' of git://git.sans.ethz.ch/cdist

This commit is contained in:
Nico Schottelius 2011-03-18 23:43:25 +01:00
commit 0d0e5b65d6
2 changed files with 45 additions and 5 deletions

28
conf/type/__user/explorer/group Executable file
View file

@ -0,0 +1,28 @@
#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# Get an existing groups group entry.
#
if [ -f "$__object/parameter/gid" ]; then
gid=$(cat "$__object/parameter/gid")
getent group "$gid" || true
fi

View file

@ -35,27 +35,39 @@ fi
get_current_value() { get_current_value() {
local key="$1" local key="$1"
local new_value="$2"
local explorer="$__object/explorer/passwd"
local index local index
case "$key" in case "$key" in
password) password)
cut -d':' -f 2 "$__object/explorer/shadow" explorer="$__object/explorer/shadow"
break index=2
;; ;;
uid) index=3;; uid) index=3;;
gid) index=4;; gid)
if [[ $new_value =~ ^[0-9]+$ ]]; then
# numeric gid
index=4
else
# group name
explorer="$__object/explorer/group"
index=1
fi
;;
comment) index=5;; comment) index=5;;
home) index=6;; home) index=6;;
shell) index=7;; shell) index=7;;
esac esac
cut -d':' -f $index "$__object/explorer/passwd" cut -d':' -f $index "$explorer"
} }
set -- "$@" set -- "$@"
cd "$__object/parameter" cd "$__object/parameter"
for property in $(ls .); do for property in $(ls .); do
current_value=$(get_current_value "$property")
new_value="$(cat "$property")" new_value="$(cat "$property")"
current_value=$(get_current_value "$property" "$new_value")
if [ "$new_value" != "$current_value" ]; then if [ "$new_value" != "$current_value" ]; then
# Shedule changed properties for update # Shedule changed properties for update
set -- "$@" "--$property" \"$new_value\" set -- "$@" "--$property" \"$new_value\"