diff options
author | Andrew Cady <d@samizdat> | 2021-09-30 05:30:19 -0400 |
---|---|---|
committer | Andrew Cady <d@samizdat> | 2021-09-30 05:30:19 -0400 |
commit | a279ad98ef57d52c408db4b2085f5374dfb6abd2 (patch) | |
tree | 79ab8c8b9128e21c6dea64ee822bae0a08ef68cf | |
parent | 063c51a8217d34eb1e4490643f8771cdca0bc0c1 (diff) |
improve "cryptonomic" output, replacing drill with delv
-rw-r--r-- | selfpublish.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/selfpublish.sh b/selfpublish.sh index 7e418e1..9a151f5 100644 --- a/selfpublish.sh +++ b/selfpublish.sh | |||
@@ -77,12 +77,12 @@ dependencies() | |||
77 | cat <<EOF | 77 | cat <<EOF |
78 | apache2 (>= 2.4.46) | 78 | apache2 (>= 2.4.46) |
79 | basez | 79 | basez |
80 | bind9-dnsutils | ||
80 | cgit | 81 | cgit |
81 | curl | 82 | curl |
82 | fortune-mod | 83 | fortune-mod |
83 | fortunes-min | 84 | fortunes-min |
84 | gnupg (>= 2.2.14) | 85 | gnupg (>= 2.2.14) |
85 | ldnsutils | ||
86 | libssl1.1 (>= 1.1.1d) | 86 | libssl1.1 (>= 1.1.1d) |
87 | netmask | 87 | netmask |
88 | openssl | 88 | openssl |
@@ -456,9 +456,10 @@ then | |||
456 | 2>/dev/null withsetx ssh-keyscan "$hostname" | 456 | 2>/dev/null withsetx ssh-keyscan "$hostname" |
457 | 2>/dev/null withsetx dig +nocmd -taaaa "$hostname" +noall +answer | 457 | 2>/dev/null withsetx dig +nocmd -taaaa "$hostname" +noall +answer |
458 | 2>/dev/null withsetx dig +nocmd "$hostname" +noall +answer | 458 | 2>/dev/null withsetx dig +nocmd "$hostname" +noall +answer |
459 | 2>/dev/null withsetx drill -DS -t sshfp "$hostname" | ||
460 | 2>&1 withsetx gpg --locate-keys "$uid" | 459 | 2>&1 withsetx gpg --locate-keys "$uid" |
461 | 2>&1 withsetx ssh -o BatchMode=yes -o HostKeyAlgorithms=ssh-ed25519 -o VerifyHostKeyDNS=yes -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null "$hostname" -- true | 460 | 2>/dev/null withsetx delv @1.1.1.1 -t sshfp "$hostname" |
461 | export hostname | ||
462 | 2>&1 withsetx sh -c 'ssh -v -i /dev/null -o BatchMode=yes -o HostKeyAlgorithms=ssh-ed25519 -o VerifyHostKeyDNS=yes -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null "$hostname" -- true 2>&1 | tee cryptonomic.ssh.$$.log | egrep "DNS|Server host key|match:|Connecting to|Connection|Authenticating to"' | ||
462 | 463 | ||
463 | elif [ "$1" = hostname ] | 464 | elif [ "$1" = hostname ] |
464 | then | 465 | then |