kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/type/__hosts/no-alias' into 'master'

Browse source 
__hosts: Fix when used without --alias

See merge request ungleich-public/cdist!906
This commit is contained in:
poljakowski 2020-07-12 09:31:01 +02:00
commit c62eaa6eab
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cdist/conf/type/__hosts/manifest
View file

@ -19,21 +19,24 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
set -e -u
set -e
hostname=$__object_id
state=$(cat "$__object/parameter/state")
marker="# __hosts/$hostname"
state=$(cat "${__object}/parameter/state")
marker="# __hosts/${hostname}"
if [ "$state" = 'absent' ]
if test "${state}" != 'absent'
then
ip=$(cat "${__object}/parameter/ip")
if test -s "${__object}/parameter/alias"
then
set -- --regex "$marker"
else
ip=$(cat "$__object/parameter/ip")
aliases=$(while read -r a; do printf '\t%s' "$a"; done <"$__object/parameter/alias")
set -- --line "$(printf '%s\t%s%s %s' \
"$ip" "$hostname" "$aliases" "$marker")"
fi
__line "__hosts/$hostname" --file /etc/hosts --state "$state" "$@"
set -- --line "$(printf '%s\t%s%s %s' \
"${ip}" "${hostname}" "${aliases}" "${marker}")"
else
set -- --regex "$(echo "${marker}" | sed -e 's/\./\\./')$"
fi
__line "/etc/hosts:${hostname}" --file /etc/hosts --state "${state}" "$@"