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

Merge pull request #634 from darko-poljak/bugfix/consul_#633

Browse source 
bugfix: __consul fails if consul is already running #633
This commit is contained in:
Darko Poljak 2018-02-25 23:00:57 +01:00 • committed by GitHub
commit 44673131fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cdist/conf/type/__consul/gencode-remote
View file

@ -44,15 +44,17 @@ cksum_should=$(cat "$version_dir/cksum" | cut -d' ' -f1,2)
cat << eof cat << eof
tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX") tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX")
curl -s -L "$source" > "\$tmpdir/$source_file_name" curl -s -L "$source" > "\$tmpdir/$source_file_name"
unzip -p "\$tmpdir/$source_file_name" > "$destination" unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
rm -rf "\$tmpdir" rm -rf "\$tmpdir"
cksum_is=\$(cksum "$destination" | cut -d' ' -f1,2) cksum_is=\$(cksum "${destination}.tmp" | cut -d' ' -f1,2)
if [ "\$cksum_is" = "$cksum_should" ]; then if [ "\$cksum_is" = "$cksum_should" ]; then
rm -f "${destination}"
mv "${destination}.tmp" "${destination}"
chown root:root "$destination" chown root:root "$destination"
chmod 755 "$destination" chmod 755 "$destination"
else else
rm -f "$destination" rm -f "${destination}.tmp"
echo "Failed to verify checksum for $__object_name" >&2 echo "Failed to verify checksum for $__object_name" >&2
exit 1 exit 1
fi fi