summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-09-05 07:14:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-09-05 07:14:46 +0000
commitc1338b131aa7a1a44fd0aea8c02951f14178af97 (patch)
tree1015777a220286b97471abe25b9b6becb181aad2
parentReleasing debian version 20210904-1. (diff)
downloadopen-infrastructure-service-tools-c1338b131aa7a1a44fd0aea8c02951f14178af97.tar.xz
open-infrastructure-service-tools-c1338b131aa7a1a44fd0aea8c02951f14178af97.zip
Merging upstream version 20210905.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt10
-rw-r--r--VERSION.txt2
-rw-r--r--dehydrated/TODO2
-rwxr-xr-xdehydrated/bin/dehydrated-hook (renamed from dehydrated/bin/dehydrated-hook.d)0
-rwxr-xr-xdehydrated/bin/dehydrated-nsupdate8
-rwxr-xr-xgit/bin/git-hook (renamed from git/bin/git-hook.d)0
6 files changed, 19 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9aeb844..605761f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,13 @@
+2021-09-05 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20210905.
+
+ [ Daniel Baumann ]
+ * Renaming dehydrated-hook.d to dehydrated-hook for consistency.
+ * Renaming giit-hook.d to git-hook for consistency.
+ * Updating dehydrated todo file.
+ * Adding tsig keyfile support to dehydrated-nsupdate.
+
2021-09-04 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* Releasing version 20210904.
diff --git a/VERSION.txt b/VERSION.txt
index fd5abf1..7633bd1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20210904
+20210905
diff --git a/dehydrated/TODO b/dehydrated/TODO
index 0025e8a..bd980cc 100644
--- a/dehydrated/TODO
+++ b/dehydrated/TODO
@@ -1,4 +1,4 @@
TODO
====
- * add hmac/tsig support
+ * write manpages
diff --git a/dehydrated/bin/dehydrated-hook.d b/dehydrated/bin/dehydrated-hook
index 4e7b7ff..4e7b7ff 100755
--- a/dehydrated/bin/dehydrated-hook.d
+++ b/dehydrated/bin/dehydrated-hook
diff --git a/dehydrated/bin/dehydrated-nsupdate b/dehydrated/bin/dehydrated-nsupdate
index ec8cf7f..7b6ea34 100755
--- a/dehydrated/bin/dehydrated-nsupdate
+++ b/dehydrated/bin/dehydrated-nsupdate
@@ -103,6 +103,11 @@ do
fi
done
+if [ -n "${TSIG_KEYFILE}" ] && [ -e "${TSIG_KEYFILE}" ]
+then
+ NSUPDATE_OPTIONS="-k ${TSIG_KEYFILE}"
+fi
+
NAMESERVERS="$(${DIG} +short NS "${ZONE}")"
# update nameservers
@@ -110,11 +115,12 @@ for NAMESERVER in ${NAMESERVERS}
do
echo -n " + sending '${HOOK_ACTION}' for ${TXT_RECORD} to ${NAMESERVER}..."
+# shellcheck disable=SC2086
echo "server ${NAMESERVER}
zone ${ZONE}
ttl 0
update ${HOOK_ACTION} ${TXT_RECORD} 0 TXT ${TOKEN_VALUE}
-send" | "${NSUPDATE}"
+send" | "${NSUPDATE}" ${NSUPDATE_OPTIONS}
echo " done."
done
diff --git a/git/bin/git-hook.d b/git/bin/git-hook
index b6928d9..b6928d9 100755
--- a/git/bin/git-hook.d
+++ b/git/bin/git-hook