diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-30 17:45:05 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-30 17:45:05 +0000 |
| commit | c6d25830fada04b3d5e8a7b79eac5e878ada8f07 (patch) | |
| tree | e52a506b07778b5ae323bbee58ea78c7a9140ac0 | |
| parent | Adding debian version 20231120-1. (diff) | |
| download | open-infrastructure-service-tools-c6d25830fada04b3d5e8a7b79eac5e878ada8f07.tar.xz open-infrastructure-service-tools-c6d25830fada04b3d5e8a7b79eac5e878ada8f07.zip | |
Merging upstream version 20240930.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
62 files changed, 79 insertions, 192 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 085f45b..2e65d35 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,16 @@ +2024-09-30 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing ersion 20240930. + + [ Daniel Baumann ] + * Removing znuny-tools, not used anymore. + * Updating error messages if dependencies are not there to list all programs in dehydrated-nsupdate hook. + * Also listing certificate name when sending nsupdate in dehydrated-nsupdate hook to be more verbose. + * Updating lldp flag in linux-ice. + * Updating copyright notices for 2024. + * Updating dehydrated todo. + * Getting remote branches after pull to account for newly added branches in git-pull-branches. + 2023-11-20 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20231020. @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/VERSION.txt b/VERSION.txt index 8bf6a02..bd531cb 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20231120 +20240930 diff --git a/apache/Makefile b/apache/Makefile index 9b5b4db..cf3fdcc 100644 --- a/apache/Makefile +++ b/apache/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/apache/share/man/Makefile b/apache/share/man/Makefile index e8d97fb..6833446 100644 --- a/apache/share/man/Makefile +++ b/apache/share/man/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/apache/share/man/man.in b/apache/share/man/man.in index bcc6362..1eec258 100644 --- a/apache/share/man/man.in +++ b/apache/share/man/man.in @@ -1,6 +1,6 @@ .\" Open Infrastructure: service-tools .\" -.\" Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.\" Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .\" .\" SPDX-License-Identifier: GPL-3.0+ .\" diff --git a/apache/share/man/service-tools.7.rst b/apache/share/man/service-tools.7.rst index bbe6b00..29bfcc7 100644 --- a/apache/share/man/service-tools.7.rst +++ b/apache/share/man/service-tools.7.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: apache-tools -.. Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/apt/Makefile b/apt/Makefile index 49377eb..a44e2e8 100644 --- a/apt/Makefile +++ b/apt/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/apt/bin/apt-install b/apt/bin/apt-install index 323d1b6..2736f99 100755 --- a/apt/bin/apt-install +++ b/apt/bin/apt-install @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/apt/bin/apt-remove b/apt/bin/apt-remove index 719c8e7..0ea6792 100755 --- a/apt/bin/apt-remove +++ b/apt/bin/apt-remove @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/apt/share/man/Makefile b/apt/share/man/Makefile index ce5fe50..001325f 100644 --- a/apt/share/man/Makefile +++ b/apt/share/man/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/apt/share/man/apt-install.1.rst b/apt/share/man/apt-install.1.rst index 6880898..ae6936a 100644 --- a/apt/share/man/apt-install.1.rst +++ b/apt/share/man/apt-install.1.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: service-tools -.. Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/apt/share/man/man.in b/apt/share/man/man.in index bcc6362..1eec258 100644 --- a/apt/share/man/man.in +++ b/apt/share/man/man.in @@ -1,6 +1,6 @@ .\" Open Infrastructure: service-tools .\" -.\" Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.\" Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .\" .\" SPDX-License-Identifier: GPL-3.0+ .\" 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. 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 <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. 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 <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. 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 <daniel.baumann@open-infrastructure.net> +.\" Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .\" .\" SPDX-License-Identifier: GPL-3.0+ .\" diff --git a/dnsdist/Makefile b/dnsdist/Makefile index 49377eb..a44e2e8 100644 --- a/dnsdist/Makefile +++ b/dnsdist/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/dnsdist/bin/dnsdist-console b/dnsdist/bin/dnsdist-console index 9ddbc30..0a8b024 100755 --- a/dnsdist/bin/dnsdist-console +++ b/dnsdist/bin/dnsdist-console @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/Makefile b/git/Makefile index 14db1ef..5871666 100644 --- a/git/Makefile +++ b/git/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-checkout-branches b/git/bin/git-checkout-branches index dd04bb6..ba6efd1 100755 --- a/git/bin/git-checkout-branches +++ b/git/bin/git-checkout-branches @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-hook b/git/bin/git-hook index 81776ea..840f5f6 100755 --- a/git/bin/git-hook +++ b/git/bin/git-hook @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-pull-branches b/git/bin/git-pull-branches index aca1ea3..9e84041 100755 --- a/git/bin/git-pull-branches +++ b/git/bin/git-pull-branches @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # @@ -22,11 +22,12 @@ set -e CURRENT_BRANCH="$(git branch --show-current)" -REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')" # pull current branch git pull +REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')" + # pull remote branches for REMOTE_BRANCH in ${REMOTE_BRANCHES} do diff --git a/git/bin/git-remove-origin-branches b/git/bin/git-remove-origin-branches index de403ca..c687783 100755 --- a/git/bin/git-remove-origin-branches +++ b/git/bin/git-remove-origin-branches @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-remove-origin-tags b/git/bin/git-remove-origin-tags index 1de452f..1ccbacb 100755 --- a/git/bin/git-remove-origin-tags +++ b/git/bin/git-remove-origin-tags @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-repo-repack b/git/bin/git-repo-repack index 035d55a..f78f40b 100755 --- a/git/bin/git-repo-repack +++ b/git/bin/git-repo-repack @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/share/hooks/post-update.d/cgit-agefile b/git/share/hooks/post-update.d/cgit-agefile index 4faafd6..1356924 100755 --- a/git/share/hooks/post-update.d/cgit-agefile +++ b/git/share/hooks/post-update.d/cgit-agefile @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/share/hooks/post-update.d/git-update-server-info b/git/share/hooks/post-update.d/git-update-server-info index c90015a..7cb8aa7 100755 --- a/git/share/hooks/post-update.d/git-update-server-info +++ b/git/share/hooks/post-update.d/git-update-server-info @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/share/hooks/post-update.d/irker-notification b/git/share/hooks/post-update.d/irker-notification index 8ef52ce..7d0d0da 100755 --- a/git/share/hooks/post-update.d/irker-notification +++ b/git/share/hooks/post-update.d/irker-notification @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/irker/Makefile b/irker/Makefile index 213ddfa..63616ea 100644 --- a/irker/Makefile +++ b/irker/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/irker/bin/irkerhook-debian b/irker/bin/irkerhook-debian index 71c85b4..78b23ae 100755 --- a/irker/bin/irkerhook-debian +++ b/irker/bin/irkerhook-debian @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/kea/Makefile b/kea/Makefile index 49377eb..a44e2e8 100644 --- a/kea/Makefile +++ b/kea/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/kea/bin/kea-leases-reset b/kea/bin/kea-leases-reset index f1e4d91..69417d5 100755 --- a/kea/bin/kea-leases-reset +++ b/kea/bin/kea-leases-reset @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/knot-resolver/Makefile b/knot-resolver/Makefile index 49377eb..a44e2e8 100644 --- a/knot-resolver/Makefile +++ b/knot-resolver/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/knot-resolver/bin/kresd-cache-clear b/knot-resolver/bin/kresd-cache-clear index 52042a1..b0d8854 100755 --- a/knot-resolver/bin/kresd-cache-clear +++ b/knot-resolver/bin/kresd-cache-clear @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/knot/Makefile b/knot/Makefile index a4f4977..af08ba9 100644 --- a/knot/Makefile +++ b/knot/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/knot/bin/knot-zones-reset b/knot/bin/knot-zones-reset index d007906..9a2e5dc 100755 --- a/knot/bin/knot-zones-reset +++ b/knot/bin/knot-zones-reset @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/linux/Makefile b/linux/Makefile index 8274c79..b3b230b 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/linux/bin/linux-i40e b/linux/bin/linux-i40e index 9ab0426..f4936cb 100755 --- a/linux/bin/linux-i40e +++ b/linux/bin/linux-i40e @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/linux/bin/linux-ice b/linux/bin/linux-ice index 5f0feee..18d20a2 100755 --- a/linux/bin/linux-ice +++ b/linux/bin/linux-ice @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # @@ -80,7 +80,7 @@ Start () for DEVICE in ${DEVICES} do echo -n "Configuring ${DEVICE}:" - Ethtool_set "${DEVICE}" disable-fw-lldp on + Ethtool_set "${DEVICE}" fw-lldp-agent on Ethtool_set "${DEVICE}" link-down-on-close on echo done @@ -93,7 +93,7 @@ Stop () for DEVICE in ${DEVICES} do echo -n "Deconfiguring ${DEVICE}:" - Ethtool_set "${DEVICE}" disable-fw-lldp off + Ethtool_set "${DEVICE}" fw-lldp-agent off Ethtool_set "${DEVICE}" link-down-on-close off echo done @@ -104,7 +104,7 @@ Status () for DEVICE in ${DEVICES} do echo -n "${DEVICE}:" - Ethtool_get "${DEVICE}" disable-fw-lldp on + Ethtool_get "${DEVICE}" fw-lldp-agent on Ethtool_get "${DEVICE}" link-down-on-close on echo done diff --git a/linux/share/man/Makefile b/linux/share/man/Makefile index ce5fe50..001325f 100644 --- a/linux/share/man/Makefile +++ b/linux/share/man/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/linux/share/man/linux-i40e.1.rst b/linux/share/man/linux-i40e.1.rst index 890ac02..564c71d 100644 --- a/linux/share/man/linux-i40e.1.rst +++ b/linux/share/man/linux-i40e.1.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: service-tools -.. Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/linux/share/man/linux-ice.1.rst b/linux/share/man/linux-ice.1.rst index 1abfb90..946d476 100644 --- a/linux/share/man/linux-ice.1.rst +++ b/linux/share/man/linux-ice.1.rst @@ -1,6 +1,6 @@ .. Open Infrastructure: service-tools -.. Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.. Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .. .. SPDX-License-Identifier: GPL-3.0+ .. diff --git a/linux/share/man/man.in b/linux/share/man/man.in index bcc6362..1eec258 100644 --- a/linux/share/man/man.in +++ b/linux/share/man/man.in @@ -1,6 +1,6 @@ .\" Open Infrastructure: service-tools .\" -.\" Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +.\" Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> .\" .\" SPDX-License-Identifier: GPL-3.0+ .\" diff --git a/supermicro/Makefile b/supermicro/Makefile index 49377eb..a44e2e8 100644 --- a/supermicro/Makefile +++ b/supermicro/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/vim/Makefile b/vim/Makefile index 49377eb..a44e2e8 100644 --- a/vim/Makefile +++ b/vim/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/vim/bin/vim-mtime b/vim/bin/vim-mtime index c0a0ad3..31243ce 100755 --- a/vim/bin/vim-mtime +++ b/vim/bin/vim-mtime @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2024 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/znuny/Makefile b/znuny/Makefile deleted file mode 100644 index 49377eb..0000000 --- a/znuny/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# Open Infrastructure: service-tools - -# Copyright (C) 2014-2023 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/>. - -SHELL := sh -e - -SCRIPTS = bin/* - -all: build - -test: - @echo -n "Checking for syntax errors with sh... " - @for SCRIPT in $(SCRIPTS); \ - do \ - sh -n $${SCRIPT}; \ - echo -n "."; \ - done - @echo " done." - - @echo -n "Checking for bashisms... " - @if [ -x /usr/bin/checkbashisms ]; \ - then \ - for SCRIPT in $(SCRIPTS); \ - do \ - checkbashisms -f -x $${SCRIPT}; \ - echo -n "."; \ - done; \ - else \ - echo "Note: devscripts not installed, skipping checkbashisms."; \ - fi - @echo " done." - - @echo -n "Checking with shellcheck... " - @if [ -x /usr/bin/shellcheck ]; \ - then \ - for SCRIPT in $(SCRIPTS); \ - do \ - shellcheck -e SC2039 $${SCRIPT}; \ - echo -n "."; \ - done; \ - else \ - echo "Note: shellcheck not installed, skipping shellcheck."; \ - fi - @echo " done." - -build: - -install: build - mkdir -p $(DESTDIR)/usr/bin - cp -r bin/* $(DESTDIR)/usr/bin - -uninstall: - for FILE in bin/*; \ - do \ - rm -f $(DESTDIR)/usr/bin/$$(basename $${FILE}); \ - done - rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true - - rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true - -clean: - -distclean: - -reinstall: uninstall install diff --git a/znuny/bin/otrs.Console.pl b/znuny/bin/otrs.Console.pl deleted file mode 100755 index 65d628c..0000000 --- a/znuny/bin/otrs.Console.pl +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# Open Infrastructure: service-tools - -# Copyright (C) 2014-2023 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 - -sudo -u otrs /usr/share/otrs/bin/otrs.Console.pl ${@} diff --git a/znuny/bin/otrs.Daemon.pl b/znuny/bin/otrs.Daemon.pl deleted file mode 100755 index 4317808..0000000 --- a/znuny/bin/otrs.Daemon.pl +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# Open Infrastructure: service-tools - -# Copyright (C) 2014-2023 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 - -sudo -u otrs /usr/share/otrs/bin/otrs.Daemon.pl ${@} |