summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-06-20 04:28:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-06-20 04:28:58 +0000
commit1c206a4268ecbb31b75d60a1092ac562726dde28 (patch)
treed08e353c57ae373222206c8e2b01ba71cad2dfb8
parentReleasing debian version 20221225-1. (diff)
downloadopen-infrastructure-service-tools-1c206a4268ecbb31b75d60a1092ac562726dde28.tar.xz
open-infrastructure-service-tools-1c206a4268ecbb31b75d60a1092ac562726dde28.zip
Merging upstream version 20221226.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt8
-rw-r--r--VERSION.txt2
-rwxr-xr-xdehydrated/share/hooks/deploy_cert.extra8
-rwxr-xr-xdehydrated/share/hooks/exit_hook.extra-cleanup2
4 files changed, 14 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2bca1d1..859b599 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2022-12-26 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20221226.
+
+ [ Daniel Baumann ]
+ * Adding root_intermediate_cert to exit_hook.extra-cleanup dehydrated hook.
+ * Creating relative links for extra certificates in deploy_cert.extra dehydrated hook.
+
2022-12-25 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20221225.
diff --git a/VERSION.txt b/VERSION.txt
index afa39b2..6c91a60 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20221225
+20221226
diff --git a/dehydrated/share/hooks/deploy_cert.extra b/dehydrated/share/hooks/deploy_cert.extra
index b0d8737..391f767 100755
--- a/dehydrated/share/hooks/deploy_cert.extra
+++ b/dehydrated/share/hooks/deploy_cert.extra
@@ -46,17 +46,17 @@ case "${CHAIN}" in
# intermediate (R3)
mv "${TMPFILE}00" "${DIRECTORY}/intermediate-${TIMESTAMP}.pem"
- ln -sf "${DIRECTORY}/intermediate-${TIMESTAMP}.pem" "${DIRECTORY}/intermediate.pem"
+ ln -sf "intermediate-${TIMESTAMP}.pem" "${DIRECTORY}/intermediate.pem"
# root (ISRG Root X1)
mv "${TMPFILE}01" "${DIRECTORY}/root-${TIMESTAMP}.pem"
- ln -sf "${DIRECTORY}/root-${TIMESTAMP}.pem" "${DIRECTORY}/root.pem"
+ ln -sf "root-${TIMESTAMP}.pem" "${DIRECTORY}/root.pem"
;;
short)
# intermediate (R3)
grep -Ev '^$' "${DIRECTORY}/chain-${TIMESTAMP}.pem" > "${DIRECTORY}/intermediate-${TIMESTAMP}.pem"
- ln -sf "${DIRECTORY}/intermediate-${TIMESTAMP}.pem" "${DIRECTORY}/intermediate.pem"
+ ln -sf "intermediate-${TIMESTAMP}.pem" "${DIRECTORY}/intermediate.pem"
# root (ISRG Root X1)
ISSUER_URI="$(openssl x509 -in "${DIRECTORY}/chain-${TIMESTAMP}.pem" -text -noout | grep 'Authority Information Access:' -A1 | awk -FURI: '/http/ { print $2 }')"
@@ -64,7 +64,7 @@ case "${CHAIN}" in
if [ -n "${ISSUER_URI}" ]
then
wget -q "${ISSUER_URI}" -O - | openssl x509 -outform PEM > "${DIRECTORY}/root-${TIMESTAMP}.pem"
- ln -sf "${DIRECTORY}/root-${TIMESTAMP}.pem" "${DIRECTORY}/root.pem"
+ ln -sf "root-${TIMESTAMP}.pem" "${DIRECTORY}/root.pem"
fi
;;
esac
diff --git a/dehydrated/share/hooks/exit_hook.extra-cleanup b/dehydrated/share/hooks/exit_hook.extra-cleanup
index 59e203e..fc09f7b 100755
--- a/dehydrated/share/hooks/exit_hook.extra-cleanup
+++ b/dehydrated/share/hooks/exit_hook.extra-cleanup
@@ -23,7 +23,7 @@ set -e
echo -n " + Cleanup extra certificate files..."
-for EXTRA in root intermediate fullchain_privkey privkey_fullchain
+for EXTRA in root intermediate fullchain_privkey privkey_fullchain root_intermediate_cert
do
for CERTIFICATE in "${CERTDIR}"/*/
do