From d188040ec5c50f22bd926d97e905eb04e7adcb9d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 7 Jul 2022 15:45:37 +0200 Subject: Adding cleanup hooks for extra files in dehydrated (FIXME). Signed-off-by: Daniel Baumann --- .../share/hooks/exit_hook.cleanup-extra-cert | 42 +++++++++++++++++++++ .../share/hooks/exit_hook.cleanup-extra-ocsp | 43 ++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100755 dehydrated/share/hooks/exit_hook.cleanup-extra-cert create mode 100755 dehydrated/share/hooks/exit_hook.cleanup-extra-ocsp (limited to 'dehydrated/share') diff --git a/dehydrated/share/hooks/exit_hook.cleanup-extra-cert b/dehydrated/share/hooks/exit_hook.cleanup-extra-cert new file mode 100755 index 0000000..816a65c --- /dev/null +++ b/dehydrated/share/hooks/exit_hook.cleanup-extra-cert @@ -0,0 +1,42 @@ +#!/bin/sh + +# Open Infrastructure: service-tools + +# Copyright (C) 2014-2022 Daniel Baumann +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set -e + +echo " + Deleting extra certificate files..." + +for EXTRA in fullchain-privkey privkey-fullchain +do + EXTRA1="$(echo ${EXTRA} | awk -F- '{ print $1 }')" + EXTRA2="$(echo ${EXTRA} | awk -F- '{ print $2 }')" + + for FILE in "${CERTDIR}"/*/"cert.${EXTRA1}-${EXTRA2}-"*.pem + do + LINK="$(dirname ${FILE})/cert.${EXTRA1}-${EXTRA2}.pem" + + if [ "${FILE}" != "${LINK}" ] + then + rm -f "${FILE}" + fi + done +done + +echo " done." diff --git a/dehydrated/share/hooks/exit_hook.cleanup-extra-ocsp b/dehydrated/share/hooks/exit_hook.cleanup-extra-ocsp new file mode 100755 index 0000000..0efc812 --- /dev/null +++ b/dehydrated/share/hooks/exit_hook.cleanup-extra-ocsp @@ -0,0 +1,43 @@ +#!/bin/sh + +# Open Infrastructure: service-tools + +# Copyright (C) 2014-2022 Daniel Baumann +# +# SPDX-License-Identifier: GPL-3.0+ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set -e + +echo " + Deleting extra ocsp links..." + +for EXTRA in fullchain-privkey privkey-fullchain +do + EXTRA1="$(echo ${EXTRA} | awk -F- '{ print $1 }')" + EXTRA2="$(echo ${EXTRA} | awk -F- '{ print $2 }')" + + for FILE in "${CERTDIR}"/*/ocsp-*.der + do + LINK="$(dirname ${FILE})/cert.${EXTRA1}-${EXTRA2}.pem.ocsp" + ORIGINAL="$(readlink "${LINK}")" + + if [ ! -e "$(dirname ${FILE})/${ORIGINAL}" ] + then + rm -f "${LINK}" + fi + done +done + +echo " done." -- cgit v1.2.3