From 818bce1d5ac0878d3d39bcb70388c4305ffdaabe Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 30 Sep 2024 19:40:20 +0200 Subject: Merging upstream version 20240930. Signed-off-by: Daniel Baumann --- dehydrated/Makefile | 2 +- dehydrated/TODO | 1 + dehydrated/bin/dehydrated-cron | 2 +- dehydrated/bin/dehydrated-hook | 2 +- dehydrated/bin/dehydrated-nsupdate | 8 ++++---- dehydrated/share/hooks/deploy_cert.chrony | 2 +- dehydrated/share/hooks/deploy_cert.extra | 2 +- dehydrated/share/hooks/deploy_ocsp.extra | 2 +- dehydrated/share/hooks/exit_hook.extra-cleanup | 2 +- dehydrated/share/hooks/exit_hook.fix-permissions | 2 +- dehydrated/share/hooks/exit_hook.service-reload | 2 +- dehydrated/share/man/Makefile | 2 +- dehydrated/share/man/dehydrated-cron.1.rst | 2 +- dehydrated/share/man/dehydrated-hook.1.rst | 2 +- dehydrated/share/man/dehydrated-nsupdate.1.rst | 2 +- dehydrated/share/man/man.in | 2 +- 16 files changed, 19 insertions(+), 18 deletions(-) (limited to 'dehydrated') diff --git a/dehydrated/Makefile b/dehydrated/Makefile index bf6fc46..afa7737 100644 --- a/dehydrated/Makefile +++ b/dehydrated/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/TODO b/dehydrated/TODO index b6cc845..6542da7 100644 --- a/dehydrated/TODO +++ b/dehydrated/TODO @@ -1,6 +1,7 @@ TODO ==== + * nsupdate: don't fail when one of many nameservers don't work * add cleanup hook for extra certificates * add manpages for individual dehydrated hooks * use /etc/default for dehydrated-cron diff --git a/dehydrated/bin/dehydrated-cron b/dehydrated/bin/dehydrated-cron index c1da9c5..c0adb76 100755 --- a/dehydrated/bin/dehydrated-cron +++ b/dehydrated/bin/dehydrated-cron @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/bin/dehydrated-hook b/dehydrated/bin/dehydrated-hook index 470fa50..f430e3d 100755 --- a/dehydrated/bin/dehydrated-hook +++ b/dehydrated/bin/dehydrated-hook @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/bin/dehydrated-nsupdate b/dehydrated/bin/dehydrated-nsupdate index d59e5ff..127b6a4 100755 --- a/dehydrated/bin/dehydrated-nsupdate +++ b/dehydrated/bin/dehydrated-nsupdate @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -51,7 +51,7 @@ then # bind-dnsutils DIG_VARIANT="bind" else - echo "'${HOOK}': need dig from bind-dnsutils or knot-dnsutils" >&2 + echo "'${HOOK}': need dig from bind-dnsutils or kdig from knot-dnsutils" >&2 exit 1 fi @@ -75,7 +75,7 @@ then # bind-dnsutils NSUPDATE_VARIANT="bind" else - echo "'${HOOK}': need nsupdate from bind-dnsutils or knot-dnsutils" >&2 + echo "'${HOOK}': need nsupdate from bind-dnsutils or knsupdate from knot-dnsutils" >&2 exit 1 fi @@ -199,7 +199,7 @@ do esac fi - echo -n " + sending '${HOOK_ACTION}' for ${TXT_RECORD} to ${NAMESERVER}.." + echo -n " + ${DOMAIN}: sending '${HOOK_ACTION}' for ${TXT_RECORD} to ${NAMESERVER}.." # shellcheck disable=SC2086 echo "server ${NAMESERVER} diff --git a/dehydrated/share/hooks/deploy_cert.chrony b/dehydrated/share/hooks/deploy_cert.chrony index 40771a8..f79d38f 100755 --- a/dehydrated/share/hooks/deploy_cert.chrony +++ b/dehydrated/share/hooks/deploy_cert.chrony @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/hooks/deploy_cert.extra b/dehydrated/share/hooks/deploy_cert.extra index 5cf7b72..de57c87 100755 --- a/dehydrated/share/hooks/deploy_cert.extra +++ b/dehydrated/share/hooks/deploy_cert.extra @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/hooks/deploy_ocsp.extra b/dehydrated/share/hooks/deploy_ocsp.extra index 869616d..6977a7f 100755 --- a/dehydrated/share/hooks/deploy_ocsp.extra +++ b/dehydrated/share/hooks/deploy_ocsp.extra @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/hooks/exit_hook.extra-cleanup b/dehydrated/share/hooks/exit_hook.extra-cleanup index 02baa19..6c5ca5d 100755 --- a/dehydrated/share/hooks/exit_hook.extra-cleanup +++ b/dehydrated/share/hooks/exit_hook.extra-cleanup @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/hooks/exit_hook.fix-permissions b/dehydrated/share/hooks/exit_hook.fix-permissions index fa8ef95..672dd7b 100755 --- a/dehydrated/share/hooks/exit_hook.fix-permissions +++ b/dehydrated/share/hooks/exit_hook.fix-permissions @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/hooks/exit_hook.service-reload b/dehydrated/share/hooks/exit_hook.service-reload index dcbbb58..68bc6ec 100755 --- a/dehydrated/share/hooks/exit_hook.service-reload +++ b/dehydrated/share/hooks/exit_hook.service-reload @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/man/Makefile b/dehydrated/share/man/Makefile index ce5fe50..001325f 100644 --- a/dehydrated/share/man/Makefile +++ b/dehydrated/share/man/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dehydrated/share/man/dehydrated-cron.1.rst b/dehydrated/share/man/dehydrated-cron.1.rst index 9e63fa3..e1193ae 100644 --- a/dehydrated/share/man/dehydrated-cron.1.rst +++ b/dehydrated/share/man/dehydrated-cron.1.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: service-tools -.. Copyright (C) 2014-2023 Daniel Baumann +.. Copyright (C) 2014-2024 Daniel Baumann .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/dehydrated/share/man/dehydrated-hook.1.rst b/dehydrated/share/man/dehydrated-hook.1.rst index 732bd12..70a1be8 100644 --- a/dehydrated/share/man/dehydrated-hook.1.rst +++ b/dehydrated/share/man/dehydrated-hook.1.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: service-tools -.. Copyright (C) 2014-2023 Daniel Baumann +.. Copyright (C) 2014-2024 Daniel Baumann .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/dehydrated/share/man/dehydrated-nsupdate.1.rst b/dehydrated/share/man/dehydrated-nsupdate.1.rst index 6a9ad4f..2068b6e 100644 --- a/dehydrated/share/man/dehydrated-nsupdate.1.rst +++ b/dehydrated/share/man/dehydrated-nsupdate.1.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: service-tools -.. Copyright (C) 2014-2023 Daniel Baumann +.. Copyright (C) 2014-2024 Daniel Baumann .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/dehydrated/share/man/man.in b/dehydrated/share/man/man.in index bcc6362..1eec258 100644 --- a/dehydrated/share/man/man.in +++ b/dehydrated/share/man/man.in @@ -1,6 +1,6 @@ .\" Open Infrastructure: service-tools .\" -.\" Copyright (C) 2014-2023 Daniel Baumann +.\" Copyright (C) 2014-2024 Daniel Baumann .\" .\" SPDX-License-Identifier: GPL-3.0+ .\" -- cgit v1.2.3