summaryrefslogtreecommitdiffstats
path: root/dehydrated
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-06-20 04:28:54 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-06-20 04:28:54 +0000
commit25026494255e30a8e4d117bf521aea00558c02f1 (patch)
tree11277415b5181bf511418fd59651079ffa5a34c8 /dehydrated
parentAdding upstream version 20221225. (diff)
downloadopen-infrastructure-service-tools-25026494255e30a8e4d117bf521aea00558c02f1.tar.xz
open-infrastructure-service-tools-25026494255e30a8e4d117bf521aea00558c02f1.zip
Adding upstream version 20221226.upstream/20221226
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dehydrated')
-rwxr-xr-xdehydrated/share/hooks/deploy_cert.extra8
-rwxr-xr-xdehydrated/share/hooks/exit_hook.extra-cleanup2
2 files changed, 5 insertions, 5 deletions
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