X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fauthorized_keys.erb;h=efb9391be3590faf10a527dfd3eff8a93cadd4ee;hb=6b4cdc62b58751da3d0389be86ff7a40f8386f3b;hp=fda1dafe17eb65b91671fb4d7211dd3f17c578c5;hpb=8ab0f63beb2ab517f0a8c8d7144d82a52cbe6043;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index fda1dafe1..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
@@ -39,22 +39,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR9rh9AuBKt7yEAgtpvTPTl/SJWi2nAe5h5cnhTpWw
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+qHoJfNvqW7Ha5Tsrg6387tL3Xt4wjPhnxu082pm3bJFEkQAYVzJHtBdTWR6H2OABgPmLjC+sO5MGuXOzTNnVyL+CbhYRRSjHPHq3eaot7m4v0okIwWTcFBhb5YqRxeQHx5NK63y6yQWOYIoHH38iDBVm555RxlLGcGTGInXPoLQzpcTM0JL0aethYuNSDgmf/K6dDyEoUmzCKDgOfpOmgSWe//PiqV/ULN1/QzV3Ho/l7P5l3iYw8LBXreFuqiJjQ9YXVUL/DVMaab8yTQNnxmTTrrfzj/KSasNCzHo1FBK9n4AjGQQLs58RQuAHoBBCAhR7DfNa+zDAQBlt7c6V jcristau - authentication key 1AEFE8A5 (20151225)
 # aurel32
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDJp6ryOTW7VgqEa+n6uKpi/bh2PO4P9Z/voz0zPYtPOWPpJdg7YiTlCt46feC3MrYnU0FN7Hsv+mS3syioNC3e6SemSAHwrdUTE+bsnwF+9TJN+D4AgGmw6b9gjtD4s8l8DTgLYZbYoYZ4g3YE/hdE7BNaSzMy/OaHxCxHXqmJ/3KKgHFZnhP0gziSWRjTjhWpXxQ4zR8D6EBCR+RKg1TNJmLCcRuiLOecnqNglSURyHjL5ZQHwY1kWS4BPTc5Cw09PhqsW/tdy7XtmChTMM3n+xkSmrTv89tQkz0RvpURHVUK6X/i3EwpWRmZZlb/ZGpyO71MjBoTo/K5Zhs6uisQq9eq0IFT0CY8ejkySUWQoldFw/fVNF7uAH0RiK14r8c0bC02YinFfTYHO2bKeVi+bSyV7hWfz+E39OzZ3OnWspEHrtP0XP3pMe/y2KBNBmFTePk3/yPukS0QtejYl1FjHWRb3mymkz8sv5MTAhJSmjKCOvXqJgECrdopOnJgcWy7rQ23BAvgGuUDFhZY0pVgmX40NGMlKldB+86Df5le+xR9LLjvozOxBVsrA+m8jM9tIRoCGcaf4c1mHmTloEYVwsN7UeDpaWQYSSQCc9f1oX8utPfbg7CDme9gokyaVupiYKRZCv2oxLzzQWMb6j6PcxiH1kcXw6hvqR9G2xFwktoNHgmm1HvTfmstPKssXIjKBH4kfR6PsVB+NO48EeIGv7+a0RixtG+39bFaU70i6NhXqMbcpSClOdSH6XucwX4SCni5ih7K6lNH3hmiMNTSI+OTKx2Ci0wOT3+Qt+G2L1gAtpQPpYxiIzcDTY3DXvxrsM3lmORWy9RQ0qGsjzuzMWX0PP7iv91sWGytEx3CSWw6VxEP8GGDcqcooEJOOhd/x5iFTCKJ70iHsHsK/RvsOVZhDv5mfvGVoAhyVI5RtT+Mj6U22fFP+kBv/BdRpBx8BxMxwxCQVWQLUeDpfWQDzXE5wCS4bVcVGx9GbM+xIMu7m/Kni/j5TydPEjEA7hVFHNz56pbnEYhwTXWYr6nTauByThldIPEk0ug+zIxIabAXaoxKzF6UMEZ/SZtDSYAjgHsYYx4w0sES+0nxNIha9CuGGA2rFzi3NBnrMucsPwtTcw/3SOVAuid9kUR6Sjq6/0ZeaoQ+Mk7YFkYQ7HZEoraVZy6N6UrrIdNj9WWarKpig+aHMBDCLT8Rep07BtAGJHnQjld0tssMtFnK0TV5BhPyY/I9g1sla3vHn3eaCtzQ68pbS9JnCGXHYTbFnVJa0TAIlCi7+pQC9Az/pUta05E382cD7f04o/yTCEWd7BcDZSRuyuTInZZVseD1pCVg9O4H4THVtsqVqWWfuxbZ aurel32's root key for debian.org
-
+# 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")
-%>