diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-26 16:58:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-26 17:09:27 +0000 |
| commit | 7aeaedb959e01106ff8cc4e21235799125337ab2 (patch) | |
| tree | 6ddade9cf3ceaa16e58754e2834d1c66f99d9ae1 | |
| parent | Adding upstream version 20220624. (diff) | |
| download | open-infrastructure-service-tools-7aeaedb959e01106ff8cc4e21235799125337ab2.tar.xz open-infrastructure-service-tools-7aeaedb959e01106ff8cc4e21235799125337ab2.zip | |
Adding upstream version 20220626.upstream/20220626
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | CHANGELOG.txt | 9 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rw-r--r-- | dehydrated/TODO | 1 | ||||
| -rwxr-xr-x | dehydrated/share/hooks/exit_hook.zz-chrony | 42 |
5 files changed, 54 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 131e7d3..c46b0fd 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,12 @@ +2022-06-26 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20220626. + + [ Daniel Baumann ] + * Updating dehydrated-tools TODO file. + * Adding dehydrated hook to workaround certificate handling in chrony (#1013882). + * Updating upload url in makefile. + 2022-06-24 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20220624. @@ -95,4 +95,4 @@ release: distclean rm -rf service-tools-$(VERSION) upload: - scp ../service-tools-$(VERSION).* get.open-infrastructure.net:/srv/get.open-infrastructure.net/files/software/service-tools/upstream + scp ../service-tools-$(VERSION).* get.open-infrastructure.net:/srv/get.open-infrastructure.net/software/service-tools/upstream diff --git a/VERSION.txt b/VERSION.txt index 4956361..33c7e14 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20220624 +20220626 diff --git a/dehydrated/TODO b/dehydrated/TODO index 9af54a5..1a2504f 100644 --- a/dehydrated/TODO +++ b/dehydrated/TODO @@ -5,3 +5,4 @@ TODO * use /etc/default for dehydrated-cron * use /etc/default for dehydrated-hook * use settings from _dehydrated.$domain.$tld + * allow specifing multiple certificates in preseeding with e.g. '|' as devider diff --git a/dehydrated/share/hooks/exit_hook.zz-chrony b/dehydrated/share/hooks/exit_hook.zz-chrony new file mode 100755 index 0000000..13a7e9a --- /dev/null +++ b/dehydrated/share/hooks/exit_hook.zz-chrony @@ -0,0 +1,42 @@ +#!/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 + +if grep -r -qs -E '^ntsserver(cert|key)' /etc/chrony +then + echo -n " + chrony (workaround):" + + # https://bugs.debian.org/1013882 + HOST="$(cat /etc/hostname)" + + cp -L "/var/lib/dehydrated/certs/${HOST}/fullchain.pem" /etc/chrony/cert.pem + cp -L "/var/lib/dehydrated/certs/${HOST}/privkey.pem" /etc/chrony/key.pem + + chown _chrony:_chrony /etc/chrony/cert.pem /etc/chrony/key.pem + + if service chrony status > /dev/null 2>&1 + then + service chrony restart + fi + + echo " done." +fi |