Different and cleaner implementation of more atomic file attribute
change (credits to Steven Armstrong).
This commit is contained in:
Mark Verboom
parent
bd5537f416
commit
ea4a2aac2d
2 changed files with 131 additions and 101 deletions
|
|
@ -22,43 +22,8 @@
|
||||||
destination="/$__object_id"
|
destination="/$__object_id"
|
||||||
state_should="$(cat "$__object/parameter/state")"
|
state_should="$(cat "$__object/parameter/state")"
|
||||||
type="$(cat "$__object/explorer/type")"
|
type="$(cat "$__object/explorer/type")"
|
||||||
stat_file="$__object/explorer/stat"
|
|
||||||
fire_onchange=''
|
|
||||||
|
|
||||||
get_current_value() {
|
[ "$state_should" = "exists" ] && [ "$type" = "file" ] && exit 0 # nothing to do
|
||||||
if [ -s "$stat_file" ]; then
|
|
||||||
_name="$1"
|
|
||||||
_value="$2"
|
|
||||||
case "$_value" in
|
|
||||||
[0-9]*)
|
|
||||||
_index=2
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
_index=3
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
awk '/'"$_name"':/ { print $'$_index' }' "$stat_file"
|
|
||||||
unset _name _value _index
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
set_group() {
|
|
||||||
remote_cmd="$remote_cmd chgrp '$1' '$destination';"
|
|
||||||
echo "chgrp '$1'" >> "$__messages_out"
|
|
||||||
fire_onchange=1
|
|
||||||
}
|
|
||||||
|
|
||||||
set_owner() {
|
|
||||||
remote_cmd="$remote_cmd chown '$1' '$destination';"
|
|
||||||
echo "chown '$1'" >> "$__messages_out"
|
|
||||||
fire_onchange=1
|
|
||||||
}
|
|
||||||
|
|
||||||
set_mode() {
|
|
||||||
remote_cmd="$remote_cmd chmod '$1' '$destination';"
|
|
||||||
echo "chmod '$1'" >> "$__messages_out"
|
|
||||||
fire_onchange=1
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "$state_should" = "pre-exists" ]; then
|
if [ "$state_should" = "pre-exists" ]; then
|
||||||
if [ -f "$__object/parameter/source" ]; then
|
if [ -f "$__object/parameter/source" ]; then
|
||||||
|
|
@ -88,7 +53,6 @@ fi
|
||||||
|
|
||||||
upload_file=
|
upload_file=
|
||||||
create_file=
|
create_file=
|
||||||
remote_cmd=
|
|
||||||
if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
|
if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
|
||||||
if [ ! -f "$__object/parameter/source" ]; then
|
if [ ! -f "$__object/parameter/source" ]; then
|
||||||
remote_stat="$(cat "$__object/explorer/stat")"
|
remote_stat="$(cat "$__object/explorer/stat")"
|
||||||
|
|
@ -125,10 +89,20 @@ if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
|
||||||
touch "$__object/files/set-attributes"
|
touch "$__object/files/set-attributes"
|
||||||
|
|
||||||
# upload file to temp location
|
# upload file to temp location
|
||||||
tempfile_template="${destination}.cdist.XXXXXXXXXX"
|
destination_upload="${destination}${__cdist_object_marker}"
|
||||||
cat << DONE
|
cat << DONE
|
||||||
destination_upload="\$($__remote_exec $__target_host "mktemp $tempfile_template")"
|
$__remote_exec $__target_host test -e "$destination_upload" && {
|
||||||
|
echo "Refusing to upload file to existing destination: $destination_upload" >&2
|
||||||
|
exit 1
|
||||||
|
} || {
|
||||||
|
# Put a towel in place.
|
||||||
|
$__remote_exec $__target_host "umask 077; touch \"$destination_upload\""
|
||||||
|
}
|
||||||
DONE
|
DONE
|
||||||
|
# Tell gencode-remote that it has to move our file to its
|
||||||
|
# final destination.
|
||||||
|
touch "$__object/files/file-uploaded"
|
||||||
|
|
||||||
if [ "$upload_file" ]; then
|
if [ "$upload_file" ]; then
|
||||||
echo upload >> "$__messages_out"
|
echo upload >> "$__messages_out"
|
||||||
# IPv6 fix
|
# IPv6 fix
|
||||||
|
|
@ -139,69 +113,8 @@ DONE
|
||||||
my_target_host="${__target_host}"
|
my_target_host="${__target_host}"
|
||||||
fi
|
fi
|
||||||
cat << DONE
|
cat << DONE
|
||||||
$__remote_copy "$source" "${my_target_host}:\$destination_upload"
|
$__remote_copy "$source" "${my_target_host}:${destination_upload}"
|
||||||
DONE
|
DONE
|
||||||
fi
|
fi
|
||||||
remote_cmd="rm -rf \"$destination\"; mv \"\$destination_upload\" \"$destination\";"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check to change any file attributes
|
|
||||||
case "$state_should" in
|
|
||||||
present|exists)
|
|
||||||
# Note: Mode - needs to happen last as a chown/chgrp can alter mode by
|
|
||||||
# clearing S_ISUID and S_ISGID bits (see chown(2))
|
|
||||||
for attribute in group owner mode; do
|
|
||||||
if [ -f "$__object/parameter/$attribute" ]; then
|
|
||||||
value_should="$(cat "$__object/parameter/$attribute")"
|
|
||||||
|
|
||||||
# format mode in four digits => same as stat returns
|
|
||||||
if [ "$attribute" = mode ]; then
|
|
||||||
# Convert to four-digit octal number (printf interprets
|
|
||||||
# strings with leading 0s as octal!)
|
|
||||||
value_should=$(printf '%04o' "0${value_should}")
|
|
||||||
fi
|
|
||||||
|
|
||||||
value_is="$(get_current_value "$attribute" "$value_should")"
|
|
||||||
if [ -f "$__object/files/set-attributes" ] || [ "$value_should" != "$value_is" ]; then
|
|
||||||
"set_$attribute" "$value_should"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -f "$__object/files/set-attributes" ]; then
|
|
||||||
# set-attributes is created if file is created or uploaded in gencode-local
|
|
||||||
fire_onchange=1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
absent)
|
|
||||||
if [ "$type" = "file" ]; then
|
|
||||||
#echo "rm -f '$destination'"
|
|
||||||
remote_cmd="$remote_cmd rm -f '$destination';"
|
|
||||||
echo remove >> "$__messages_out"
|
|
||||||
fire_onchange=1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
pre-exists)
|
|
||||||
:
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo "Unknown state: $state_should" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Run any change to original file in 1 command as atomically as possible
|
|
||||||
if [ "$remote_cmd" != "" ]; then
|
|
||||||
cat << DONE
|
|
||||||
$__remote_exec $__target_host "$remote_cmd"
|
|
||||||
DONE
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/onchange" ]; then
|
|
||||||
if [ -n "$fire_onchange" ]; then
|
|
||||||
cat "$__object/parameter/onchange"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
117
cdist/conf/type/__file/gencode-remote
Executable file
117
cdist/conf/type/__file/gencode-remote
Executable file
|
|
@ -0,0 +1,117 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
#
|
||||||
|
# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
|
# 2013 Steven Armstrong (steven-cdist 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/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
destination="/$__object_id"
|
||||||
|
state_should="$(cat "$__object/parameter/state")"
|
||||||
|
type="$(cat "$__object/explorer/type")"
|
||||||
|
stat_file="$__object/explorer/stat"
|
||||||
|
fire_onchange=''
|
||||||
|
|
||||||
|
get_current_value() {
|
||||||
|
if [ -s "$stat_file" ]; then
|
||||||
|
_name="$1"
|
||||||
|
_value="$2"
|
||||||
|
case "$_value" in
|
||||||
|
[0-9]*)
|
||||||
|
_index=2
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
_index=3
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
awk '/'"$_name"':/ { print $'$_index' }' "$stat_file"
|
||||||
|
unset _name _value _index
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
set_group() {
|
||||||
|
echo "chgrp '$1' '$destination'"
|
||||||
|
echo "chgrp '$1'" >> "$__messages_out"
|
||||||
|
fire_onchange=1
|
||||||
|
}
|
||||||
|
|
||||||
|
set_owner() {
|
||||||
|
echo "chown '$1' '$destination'"
|
||||||
|
echo "chown '$1'" >> "$__messages_out"
|
||||||
|
fire_onchange=1
|
||||||
|
}
|
||||||
|
|
||||||
|
set_mode() {
|
||||||
|
echo "chmod '$1' '$destination'"
|
||||||
|
echo "chmod '$1'" >> "$__messages_out"
|
||||||
|
fire_onchange=1
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$state_should" in
|
||||||
|
present|exists)
|
||||||
|
if [ -f "$__object/files/file-uploaded" ]; then
|
||||||
|
# move uploaded file into place
|
||||||
|
printf 'rm -rf "%s"\n' "$destination"
|
||||||
|
printf 'mv "%s" "%s"\n' "${destination}${__cdist_object_marker}" "$destination"
|
||||||
|
fi
|
||||||
|
# Note: Mode - needs to happen last as a chown/chgrp can alter mode by
|
||||||
|
# clearing S_ISUID and S_ISGID bits (see chown(2))
|
||||||
|
for attribute in group owner mode; do
|
||||||
|
if [ -f "$__object/parameter/$attribute" ]; then
|
||||||
|
value_should="$(cat "$__object/parameter/$attribute")"
|
||||||
|
|
||||||
|
# format mode in four digits => same as stat returns
|
||||||
|
if [ "$attribute" = mode ]; then
|
||||||
|
# Convert to four-digit octal number (printf interprets
|
||||||
|
# strings with leading 0s as octal!)
|
||||||
|
value_should=$(printf '%04o' "0${value_should}")
|
||||||
|
fi
|
||||||
|
|
||||||
|
value_is="$(get_current_value "$attribute" "$value_should")"
|
||||||
|
if [ -f "$__object/files/set-attributes" ] || [ "$value_should" != "$value_is" ]; then
|
||||||
|
"set_$attribute" "$value_should"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ -f "$__object/files/set-attributes" ]; then
|
||||||
|
# set-attributes is created if file is created or uploaded in gencode-local
|
||||||
|
fire_onchange=1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
absent)
|
||||||
|
if [ "$type" = "file" ]; then
|
||||||
|
echo "rm -f '$destination'"
|
||||||
|
echo remove >> "$__messages_out"
|
||||||
|
fire_onchange=1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
pre-exists)
|
||||||
|
:
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
echo "Unknown state: $state_should" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/onchange" ]; then
|
||||||
|
if [ -n "$fire_onchange" ]; then
|
||||||
|
cat "$__object/parameter/onchange"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
Loading…
Reference in a new issue