From 38f7d341696ecc7c8a312a7c576a637a8e5adf69 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 4 Jul 2022 19:13:53 +0200
Subject: Merging upstream version 20220704.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CHANGELOG.txt                                      |  7 ++++++
 VERSION.txt                                        |  2 +-
 .../share/hooks/deploy_cert.privkey-fullchain      | 28 ++++++++++++++++++++++
 .../share/hooks/deploy_ocsp.privkey-fullchain      | 27 +++++++++++++++++++++
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100755 dehydrated/share/hooks/deploy_cert.privkey-fullchain
 create mode 100755 dehydrated/share/hooks/deploy_ocsp.privkey-fullchain

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c46b0fd..7dae7c7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+2022-07-04	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20220704.
+
+	[ Daniel Baumann ]
+	* Adding privkey-fullchain hooks as used by postfix for dehydrated.
+
 2022-06-26	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20220626.
diff --git a/VERSION.txt b/VERSION.txt
index 33c7e14..d929766 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20220626
+20220704
diff --git a/dehydrated/share/hooks/deploy_cert.privkey-fullchain b/dehydrated/share/hooks/deploy_cert.privkey-fullchain
new file mode 100755
index 0000000..bd2c4a0
--- /dev/null
+++ b/dehydrated/share/hooks/deploy_cert.privkey-fullchain
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# 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 <https://www.gnu.org/licenses/>.
+
+set -e
+
+DIRECTORY="$(dirname "${FULLCHAINFILE}")"
+FILE="cert.privkey-fullchain-${TIMESTAMP}.pem"
+
+cat "${KEYFILE}" "${FULLCHAINFILE}" > "${DIRECTORY}/${FILE}"
+ln -sf "${FILE}" "${DIRECTORY}/cert.privkey-fullchain.pem"
diff --git a/dehydrated/share/hooks/deploy_ocsp.privkey-fullchain b/dehydrated/share/hooks/deploy_ocsp.privkey-fullchain
new file mode 100755
index 0000000..d0dacf1
--- /dev/null
+++ b/dehydrated/share/hooks/deploy_ocsp.privkey-fullchain
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# 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 <https://www.gnu.org/licenses/>.
+
+set -e
+
+FILE="$(readlink "${OCSPFILE}")"
+DIRECTORY="$(dirname "${OCSPFILE}")"
+
+ln -sf "${FILE}" "${DIRECTORY}/cert.privkey-fullchain.pem.ocsp"
-- 
cgit v1.2.3