Merge branch 'master' into install_integration
This commit is contained in:
Nico Schottelius
commit
f3ab45d9ff
8 changed files with 38 additions and 146 deletions
|
|
@ -26,6 +26,18 @@ password::
|
|||
see above
|
||||
|
||||
|
||||
MESSAGES
|
||||
--------
|
||||
mod::
|
||||
group is modified
|
||||
add::
|
||||
New group added
|
||||
change <property> <new_value> <current_value>::
|
||||
Changed group property from current_value to new_value
|
||||
set <property> <new_value>::
|
||||
set property to new value, property was not set bevore
|
||||
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ if [ ! -f "$__object/parameter/nofstab" ]; then
|
|||
(
|
||||
printf "%s" "$(cat "$__object/parameter/device")"
|
||||
printf " %s" "$path"
|
||||
type="$(cat "$__object/parameter/type" || echo "auto")"
|
||||
type="$(cat "$__object/parameter/type" 2>/dev/null || echo "auto")"
|
||||
printf " %s" "$type"
|
||||
options="$(cat "$__object/parameter/options" || echo "defaults")"
|
||||
options="$(cat "$__object/parameter/options" 2>/dev/null || echo "defaults")"
|
||||
printf " %s" "$options"
|
||||
printf " %s" "$(cat "$__object/parameter/dump")"
|
||||
printf " %s\n" "$(cat "$__object/parameter/pass")"
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2012 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/>.
|
||||
#
|
||||
|
||||
owner="$(cat "$__object/parameter/owner" 2>/dev/null || echo "$__object_id")"
|
||||
if [ -f "$__object/parameter/file" ]; then
|
||||
file="$(cat "$__object/parameter/file")"
|
||||
else
|
||||
home="$("$__type_explorer/passwd" | cut -d':' -f 6)"
|
||||
file="$home/.ssh/authorized_keys"
|
||||
fi
|
||||
|
||||
# no authorized_keys file, nothing we could do
|
||||
[ -f "$file" ] || exit 0
|
||||
|
||||
# NOTE: keep variables in sync in manifest/explorer/gencode-*
|
||||
prefix="#cdist:$__object_name"
|
||||
suffix="#/cdist:$__object_name"
|
||||
awk -v prefix="$prefix" -v suffix="$suffix" '{
|
||||
if (index($0,prefix)) {
|
||||
triggered=1
|
||||
}
|
||||
if (triggered) {
|
||||
if (index($0,suffix)) {
|
||||
triggered=0
|
||||
}
|
||||
print
|
||||
}
|
||||
}' "$file"
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2012-2013 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/>.
|
||||
#
|
||||
|
||||
owner="$(cat "$__object/parameter/owner" 2>/dev/null || echo "$__object_id")"
|
||||
if [ -f "$__object/parameter/file" ]; then
|
||||
file="$(cat "$__object/parameter/file")"
|
||||
else
|
||||
home="$(cut -d':' -f 6 "$__object/explorer/passwd")"
|
||||
file="$home/.ssh/authorized_keys"
|
||||
fi
|
||||
|
||||
entry="$__object/files/entry"
|
||||
if [ ! -s "$__object/explorer/entry" ]; then
|
||||
state_is='absent'
|
||||
else
|
||||
state_is=$(diff -q "$entry" "$__object/explorer/entry" >/dev/null \
|
||||
&& echo present \
|
||||
|| echo changed
|
||||
)
|
||||
fi
|
||||
|
||||
state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo present)"
|
||||
if [ "$state_should" = "$state_is" ]; then
|
||||
# Nothing to do, move along
|
||||
exit 0
|
||||
fi
|
||||
|
||||
remove_entry() {
|
||||
# NOTE: keep variables in sync in manifest/explorer/gencode-*
|
||||
prefix="#cdist:$__object_name"
|
||||
suffix="#/cdist:$__object_name"
|
||||
cat << DONE
|
||||
tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
|
||||
# preserve ownership and permissions by copying existing file over tmpfile
|
||||
cp -p "$file" "\$tmpfile"
|
||||
awk -v prefix="$prefix" -v suffix="$suffix" '
|
||||
{
|
||||
if (index(\$0,prefix)) {
|
||||
triggered=1
|
||||
}
|
||||
if (triggered) {
|
||||
if (index(\$0,suffix)) {
|
||||
triggered=0
|
||||
}
|
||||
} else {
|
||||
print
|
||||
}
|
||||
}' "$file" > "\$tmpfile"
|
||||
mv -f "\$tmpfile" "$file"
|
||||
DONE
|
||||
}
|
||||
|
||||
case "$state_should" in
|
||||
present)
|
||||
if [ "$state_is" = "changed" ]; then
|
||||
remove_entry
|
||||
fi
|
||||
cat << DONE
|
||||
cat >> "$file" << ${__type##*/}_DONE
|
||||
$(cat "$entry")
|
||||
${__type##*/}_DONE
|
||||
DONE
|
||||
;;
|
||||
absent)
|
||||
remove_entry
|
||||
;;
|
||||
esac
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
|
||||
owner="$(cat "$__object/parameter/owner" 2>/dev/null || echo "$__object_id")"
|
||||
state="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
|
||||
state="$(cat "$__object/parameter/state" 2>/dev/null)"
|
||||
if [ -f "$__object/parameter/file" ]; then
|
||||
file="$(cat "$__object/parameter/file")"
|
||||
else
|
||||
|
|
@ -39,7 +39,7 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
|
|||
fi
|
||||
|
||||
if [ ! -f "$__object/parameter/noparent" ]; then
|
||||
# Ensure that the directory in which the authorized_keys shall be exists and
|
||||
# Ensure that the directory in which the authorized_keys shall be exists and
|
||||
# has the right permissions.
|
||||
ssh_directory="${file%/*}"
|
||||
__directory "$ssh_directory" --state present --parents \
|
||||
|
|
@ -56,19 +56,16 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
|
|||
fi
|
||||
fi
|
||||
|
||||
# NOTE: keep variables in sync in manifest/explorer/gencode-*
|
||||
prefix="#cdist:$__object_name"
|
||||
suffix="#/cdist:$__object_name"
|
||||
|
||||
mkdir "$__object/files"
|
||||
|
||||
# Generate entry for inclusion in authorized_keys file
|
||||
entry="$__object/files/entry"
|
||||
echo "$prefix" > "$entry"
|
||||
(
|
||||
if [ -f "$__object/parameter/comment" ]; then
|
||||
echo "# $(cat "$__object/parameter/comment")" >> "$entry"
|
||||
echo "# $(cat "$__object/parameter/comment")"
|
||||
fi
|
||||
cat "$__object/parameter/key" >> "$entry"
|
||||
# ensure we have a newline after keys
|
||||
echo >> "$entry"
|
||||
echo "$suffix" >> "$entry"
|
||||
cat "$__object/parameter/key"
|
||||
) | \
|
||||
__block "$__object_name" \
|
||||
--file "$file" \
|
||||
--prefix "#cdist:$__object_name" \
|
||||
--suffix "#/cdist:$__object_name" \
|
||||
--state "$state" \
|
||||
--text -
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
present
|
||||
|
|
@ -44,6 +44,15 @@ create-home::
|
|||
remove-home::
|
||||
see userdel(8), apply only on user delete
|
||||
|
||||
|
||||
MESSAGES
|
||||
--------
|
||||
mod::
|
||||
User is modified
|
||||
add::
|
||||
New user added
|
||||
|
||||
|
||||
EXAMPLES
|
||||
--------
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ Changelog
|
|||
* Exception: No braces means author == Nico Schottelius
|
||||
|
||||
3.0.2:
|
||||
* Documentation: Document all messages sent by types (Daniel Heule)
|
||||
* New Type: __block (Steven Armstrong)
|
||||
* New Type: __mount (Steven Armstrong)
|
||||
* Type __cron: Replace existing entry when changing it (Daniel Heule)
|
||||
* Type __ssh_authorized_keys: Use new type __block (Steven Armstrong)
|
||||
|
||||
|
||||
3.0.1: 2014-01-14
|
||||
|
|
|
|||
Loading…
Reference in a new issue