diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-10-31 09:32:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-10-31 09:32:42 +0000 |
| commit | e513884f36083b8ea3657be0d719926e27d64c3c (patch) | |
| tree | 8a303879b87df9514b1bdac831c9e58e5b45c319 | |
| parent | Releasing debian version 20221030-1. (diff) | |
| download | open-infrastructure-service-tools-e513884f36083b8ea3657be0d719926e27d64c3c.tar.xz open-infrastructure-service-tools-e513884f36083b8ea3657be0d719926e27d64c3c.zip | |
Merging upstream version 20221101.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | CHANGELOG.txt | 9 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | dehydrated/share/hooks/deploy_cert.chrony | 2 | ||||
| -rwxr-xr-x | dehydrated/share/hooks/deploy_cert.extra | 10 |
4 files changed, 16 insertions, 7 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e1cfab0..5772167 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,12 @@ +2022-11-01 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20221101. + + [ Daniel Baumann ] + * Correcting file handling errors in dehydrated deploy_cert.extra hook. + * Improving comment in dehydrated deploy_cert.chrony hook. + * Improving CA filename prefix in dehydrated deploy_cert.extra hook. + 2022-10-30 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20221030. diff --git a/VERSION.txt b/VERSION.txt index 1440bc5..3950253 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20221030 +20221101 diff --git a/dehydrated/share/hooks/deploy_cert.chrony b/dehydrated/share/hooks/deploy_cert.chrony index 9bccf75..b6744ff 100755 --- a/dehydrated/share/hooks/deploy_cert.chrony +++ b/dehydrated/share/hooks/deploy_cert.chrony @@ -23,9 +23,9 @@ set -e if grep -Eqrs '^ *ntsservercert' /etc/chrony then - # https://bugs.debian.org/1013882 echo -n " + Copying certificate for chrony..." + # https://bugs.debian.org/1013882 cp -fL "${FULLCHAINFILE}" /etc/chrony/cert.pem cp -fL "${KEYFILE}" /etc/chrony/key.pem diff --git a/dehydrated/share/hooks/deploy_cert.extra b/dehydrated/share/hooks/deploy_cert.extra index efca7b0..b33f562 100755 --- a/dehydrated/share/hooks/deploy_cert.extra +++ b/dehydrated/share/hooks/deploy_cert.extra @@ -30,11 +30,11 @@ echo -n " + root and intermediate CA:" TMPFILE="$(mktemp -p "${DIRECTORY}" -u ca.XXXXXXXXXX)" grep -Ev '^$' "${CHAINFILE}" | csplit -f "${TMPFILE}" -s -z - '/-----BEGIN CERTIFICATE-----/' '{*}' -mv "${TMPFILE}00" "${DIRECTORY}/ca-intermediate-${TIMESTAMP}.pem" -ln -s "${DIRECTORY}/ca-intermediate-${TIMESTAMP}.pem" "${DIRECTORY}/ca-intermediate.pem" +mv "${TMPFILE}00" "${DIRECTORY}/ca.intermediate-${TIMESTAMP}.pem" +ln -sf "${DIRECTORY}/ca.intermediate-${TIMESTAMP}.pem" "${DIRECTORY}/ca.intermediate.pem" -mv "${TMPFILE}01" "${DIRECTORY}/ca-root-${TIMESTAMP}.pem" -ln -s "${DIRECTORY}/ca-root-${TIMESTAMP}.pem" "${DIRECTORY}/ca-root.pem" +mv "${TMPFILE}01" "${DIRECTORY}/ca.root-${TIMESTAMP}.pem" +ln -sf "${DIRECTORY}/ca.root-${TIMESTAMP}.pem" "${DIRECTORY}/ca.root.pem" echo " done." @@ -45,7 +45,7 @@ do EXTRA1="$(echo ${EXTRA} | awk -F- '{ print $1 }')" EXTRA2="$(echo ${EXTRA} | awk -F- '{ print $2 }')" - cat "${EXTRA1}-${TIMESTAMP}.pem" "${EXTRA2}-${TIMESTAMP}.pem" > "${DIRECTORY}/${EXTRA1}-${EXTRA2}-${TIMESTAMP}.pem" + cat "${DIRECTORY}/${EXTRA1}-${TIMESTAMP}.pem" "${DIRECTORY}/${EXTRA2}-${TIMESTAMP}.pem" > "${DIRECTORY}/${EXTRA1}-${EXTRA2}-${TIMESTAMP}.pem" ln -sf "${EXTRA1}-${EXTRA2}-${TIMESTAMP}.pem" "${DIRECTORY}/cert.${EXTRA1}-${EXTRA2}.pem" echo " done." |