diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-06-27 09:24:17 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-06-27 09:24:17 +0000 |
| commit | 3e2de52208ecbb85ef2c6ef92035a438f0ba62de (patch) | |
| tree | 341b2acc2e310c4eb49da8dec7dd06cf1234a094 | |
| parent | Releasing debian version 20221226-1. (diff) | |
| download | open-infrastructure-service-tools-3e2de52208ecbb85ef2c6ef92035a438f0ba62de.tar.xz open-infrastructure-service-tools-3e2de52208ecbb85ef2c6ef92035a438f0ba62de.zip | |
Merging upstream version 20221227.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | CHANGELOG.txt | 7 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | dehydrated/share/hooks/deploy_ocsp.extra | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 859b599..bbfc06f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +2022-12-27 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20221227. + + [ Daniel Baumann ] + * Generalizing extra ocsp symlinks too in dehydrated hooks. + 2022-12-26 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20221226. diff --git a/VERSION.txt b/VERSION.txt index 6c91a60..154fbb1 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20221226 +20221227 diff --git a/dehydrated/share/hooks/deploy_ocsp.extra b/dehydrated/share/hooks/deploy_ocsp.extra index 35a13f6..92b2247 100755 --- a/dehydrated/share/hooks/deploy_ocsp.extra +++ b/dehydrated/share/hooks/deploy_ocsp.extra @@ -26,12 +26,11 @@ echo " + Creating extra ocsp links..." DIRECTORY="$(dirname "${OCSPFILE}")" OCSP="$(readlink "${OCSPFILE}")" -for EXTRA in fullchain_privkey privkey_fullchain +for EXTRA in fullchain_privkey privkey_fullchain root_intermediate_cert do - EXTRA1="$(echo ${EXTRA} | awk -F_ '{ print $1 }')" - EXTRA2="$(echo ${EXTRA} | awk -F_ '{ print $2 }')" + rm -f "${DIRECTORY}/${EXTRA}-${TIMESTAMP}.pem.ocsp" - ln -sf "${OCSP}" "${DIRECTORY}/${EXTRA1}_${EXTRA2}.pem.ocsp" + ln -sf "${OCSPFILE}" "${DIRECTORY}/${EXTRA}.pem.ocsp" done echo " done." |