sunet-cdn/cdn-ops
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge the 2 patch functions to 1.

Browse source
This commit is contained in:
Patrik Holmqvist 2024-09-09 17:29:31 +02:00
parent fac9a556ba
commit 7941e3f970
Signed by untrusted user: pahol
GPG key ID: 5D5B0D4E93F77273
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
edit-secrets
View file

@ -71,14 +71,12 @@ EOF
fi fi
fi fi
fi fi
}
function patch_broken_eyaml_noble {
# #
# Ubuntu 24.04 (noble) has a hiera-eyaml version that is incompatible with ruby 3.2+ (default in ubuntu24). # Ubuntu 24.04 (noble) has a hiera-eyaml version that is incompatible with ruby 3.2+ (default in ubuntu24).
# This is fixed in hiera-eyaml version 3.3.0: https://github.com/voxpupuli/hiera-eyaml/pull/340/files # This is fixed in hiera-eyaml version 3.3.0: https://github.com/voxpupuli/hiera-eyaml/pull/340/files
# https://github.com/voxpupuli/hiera-eyaml/blob/master/CHANGELOG.md # https://github.com/voxpupuli/hiera-eyaml/blob/master/CHANGELOG.md
# But there is no modern version of hiera-eyanl packaged in debian or ubuntu. # But there is no modern version of hiera-eyaml packaged in debian or ubuntu.
# https://github.com/puppetlabs/puppet/wiki/Puppet-8-Compatibility#filedirexists-removed # https://github.com/puppetlabs/puppet/wiki/Puppet-8-Compatibility#filedirexists-removed
# #
@ -269,7 +267,6 @@ function edit_eyaml_file()
done done
patch_broken_eyaml patch_broken_eyaml
patch_broken_eyaml_noble
# save source file for comparision afterwards # save source file for comparision afterwards
cp "${EYAMLFILE}" "${TMPFILE}" cp "${EYAMLFILE}" "${TMPFILE}"