Revert "Generate a DNS include file for SSHFP records"

This reverts commit 269b5b28ccf95dd4b96cac3f51168ea3280c83db.

diff --git a/cookbooks/dns/files/default/dns-update-sshfp b/cookbooks/dns/files/default/dns-update-sshfp
deleted file mode 100755 (executable)
index 907853f..0000000
--- a/cookbooks/dns/files/default/dns-update-sshfp
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-
-open(SSHFP, "-|","sshfp", "-k", "/etc/ssh/ssh_known_hosts") || die $!;
-open(SSHFP_JS, ">", "/var/lib/dns/include/sshfp.js") || die $!;
-
-print SSHFP_JS qq|var SSHFP_RECORDS = [\n|;
-
-while (my $line = <SSHFP>)
-{
-  if ($line =~ /^(\S+) IN SSHFP (\d+) (\d+) ([0-9A-F]+)$/)
-  {
-    my $host = $1;
-    my $algorithm = $2;
-    my $type = $3;
-    my $value = $4;
-
-    print SSHFP_JS qq|  SSHFP("${host}", ${algorithm}, ${type}, "${value}");\n|;
-  }
-  else
-  {
-    warn $line;
-  }
-}
-
-print SSHFP_JS qq|];\n|;
-
-close(SSHFP_JS);
-close(SSHFP);
-
-exit 0;

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 6bf913cb3745cb894431ffefe3855752cffc0a38..5b4743ef6e12dd3515cdf971fcfdb0c58b5d3cfb 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -103,13 +103,6 @@ template "/usr/local/bin/dns-update" do
   variables :passwords => passwords, :geoservers => geoservers
 end
 
   variables :passwords => passwords, :geoservers => geoservers
 end
 

-cookbook_file "/usr/local/bin/dns-update-sshfp" do
-  source "dns-update-sshfp"
-  owner "git"
-  group "git"
-  mode 0o750
-end
-

 execute "dns-update" do
   action :nothing
   command "/usr/local/bin/dns-update"
 execute "dns-update" do
   action :nothing
   command "/usr/local/bin/dns-update"


@@ -132,14 +125,6 @@ template "/var/lib/dns/creds.json" do
   variables :passwords => passwords
 end
 
   variables :passwords => passwords
 end
 

-execute "dns-update-sshfp" do
-  action :nothing
-  command "/usr/local/bin/dns-update-sshfp"
-  user "git"
-  group "git"
-  subscribes :run, "template[/etc/ssh/ssh_known_hosts]"
-end
-

 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"