X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fauthorized_keys.erb;h=efb9391be3590faf10a527dfd3eff8a93cadd4ee;hb=4fd2a89f6e76cf67ba3ddd1ca6b512c2b4501be8;hp=ea1152833b2f614c6a804baa3714b4b97af3de4f;hpb=78b8a55b01ddc1a2aee9f1da6481050ab8a07e40;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index ea1152833..efb9391be 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -1,6 +1,6 @@
 <%
-  allnodeinfo = scope.lookupvar('site::allnodeinfo')
-  roles = scope.lookupvar('site::roles')
+  allnodeinfo = scope.lookupvar('deprecated::allnodeinfo')
+  roles = scope.lookupvar('deprecated::roles')
 %>
 
 # local admin
@@ -42,20 +42,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDJp6ryOTW7VgqEa+n6uKpi/bh2PO4P9Z/voz0zPYtP
 # tfheen
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIm6NFrs16bhmsb/gZ5tDUTQ4QZGHtLHor3M9YeRXIl+ tfheen debian adm 2019-01-02
 <%=
-
-machine_keys = []
-case @fqdn
-  when "storace.debian.org" then
-    roles['dabackup_client'].each do |node|
-      if allnodeinfo.has_key?(node)
-        hostname = allnodeinfo[node]['hostname'][0]
-
-        machine_keys << "# #{hostname}"
-        machine_keys << "command=\"/usr/lib/da-backup/da-backup-ssh-wrap #{hostname}\",from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\",restrict #{allnodeinfo[node]['sshRSAHostKey'][0]}"
-      else
-        machine_keys << "# host #{node} not found in allnodeinfo"
-      end
-  end
-end
-machine_keys.join("\n")
-%>