X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fauthorized_keys.erb;h=bdf4b6093b9bb23ea086be13eb1641720cf30bfd;hb=d441de47a49eed485c9c6f040e94f845b4c5b9e8;hp=9963270f1b38031d095d02feffb58b1dfe9879d9;hpb=502a768217c9d799d305aca3585b8049d057cd7c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 9963270f1..bdf4b6093 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -4,7 +4,7 @@
 %>
 
 # local admin
-<%= localkeys = case fqdn
+<%= localkeys = case @fqdn
          when "pettersson.debian.org" then "from=\"nixon.acc.umu.se\" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwDw56/XK0/uQB+ZIOZIfZ3vpz9zLRuv6G0U4eU4VavqvaL0dXSNhGJLBDLlfpxtJYwYf/mSoK4WZasbbfHxz8jtIxK9c9aGkVA0GKT+xiHWB3J1SlwJaA7S7Ed8nNcG5PNOVd30BD5LimkS53Nz841e+MgZRuL9SfLALq7er03U= root@nixon"
 end
 localkeys
@@ -29,8 +29,8 @@ localkeys
 # DSA
 #
 # luca
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwe0KhG7S6agOekJ5U2DB/Ze2B5u9/PKo2ha765ZkYOScRWdRWUSOYwBOrrfrQUf1gCicdcsG9lLnbTeFeH4i9UJ8XUf4uhS4rK0RurKf5MN8xlqETU88q7fMTQj5LXkkJXrs8aMCxKmMhGlh62CUbANCY7i6hzXIo7KU1MIdT/E= lucaf@bofh
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1zy2/qSBpYaOKYVEnDI+KEiQlPiKsTv96zJeNdu7xLY1bwd3n0ORyTGO4Hp06PBlfek0f7/xClUHb7xgroTWAebhOes880evhGmYemQyYew+a2nBXyuiEFT8QS+Iw601zFRgy/+0nZvCAkr5Xn+mHtnhQKu5GzWsYVl3uxMo7CEiCOVpupz7FjALAoMgY25JYtFAuK0hwzAO/r9Ja89jmgdAlWJn1uAziwUVBmM6bR6AhhvI+9WR6XDzElz5pVT740kbA6ri+Jv2in9Gp7eIfgdXnaXJvxuqMk0zPB6Y7MZ0UmlvpU4A1h83SAYf6XyOHgWyn+fYhF41OR958ShLIQ== lucaf@portabofh
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNYrvjY/kH1TAHrnVZXnP8DcBgGXYQ/jP+oexcGmQfFvpXm8ivZRxZn1SXgu8Pld4pgUBcuSMITfA4egXU94FpbUDPXoORUC3Gp7U0Of/7ZH2OitVAbwW5g2M8pslogHxIyW0CmH8gPlBNNxY0CMSI2U1EBKUH4PeqZ6lgqLYIr/BGQeWfjnvsFHvD+KFPCOhNpLPytkP0eeibQ9on0Qwc6nsVMaW9kIMWRmkg6OlkWBnV/1IwgBPcQmL2IJ6H+zYjhEYeXlQ+w8Rw1a46lSo4Tqnj3CnSuH8TaX7EsI5qEstjb4bbcHSeErs4Nqy6IBHXkvYXuDNUr4GRdNETYf5V root@debian.org-id_rsa Luca Filipozzi
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1zy2/qSBpYaOKYVEnDI+KEiQlPiKsTv96zJeNdu7xLY1bwd3n0ORyTGO4Hp06PBlfek0f7/xClUHb7xgroTWAebhOes880evhGmYemQyYew+a2nBXyuiEFT8QS+Iw601zFRgy/+0nZvCAkr5Xn+mHtnhQKu5GzWsYVl3uxMo7CEiCOVpupz7FjALAoMgY25JYtFAuK0hwzAO/r9Ja89jmgdAlWJn1uAziwUVBmM6bR6AhhvI+9WR6XDzElz5pVT740kbA6ri+Jv2in9Gp7eIfgdXnaXJvxuqMk0zPB6Y7MZ0UmlvpU4A1h83SAYf6XyOHgWyn+fYhF41OR958ShLIQ== debian.org-id_rsa Luca Filipozzi
 # zobel
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuWUv0xRqmnrYX/7b80HIAY9s80Qp4QRFH3DXEkuyDeprJC+GdJs2S/fwhWI9eZDF8NN03SLoOg9q7lXoy2Ts6tda8zfqIf/IBnvcqbsoCtbmrOTvwHj5fVFh0fw72KSc8b+Bccs+1aLXUqP2eSKXB9jpR+apUd7DQ0i6si2/fwrQvqXZ71NeRkcSXIuED9PCA2298DKob1tCAXP1XSIswxxgHdGZgVHYhNt33XSM7zksTbMjr7NBZkJOcgk3dLOVz2RSo38+Curv8nPVoD4uIsE551GXnNTPZiMosvDY3Cy3gTwBhpXFxtkRDr0jMQpYj+ahQ3F+MFJr+0S89QeHfQ== Martin Zobel-Helas - debian adm key (2010-01-04) 
 # weasel
@@ -39,12 +39,14 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR9rh9AuBKt7yEAgtpvTPTl/SJWi2nAe5h5cnhTpWw
 # sgran
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6BZNqvY/6aRBxCNU55e5JZKa7D1qKMG0upZFCOl5K36uv0KXlCvIMgaQqQcce41dtNRmiyHpw3LXqdV2qJNpJAXMpsEN4F/STkftTOcFhI9nhz88IIwsboCErla1W8NxxRkBU0FxpT4Zn1wBlq30o12gtBFs3lO+nE7+k8H8I791V+3kjVAXCDh5Ep8BY4Bg8eSuhwUgmiNvWf6E6/D0s9pFJdAMFKFLPivsnc13nfgYDmxZQKrkVV8LqIGaisy7Q3LdQLKBraWYmfQ5idkaPK+EUSERdusG7pB0wzp1ieA1iEkgMRFFLBx22tQmEdmu+Wo3vM77FmNYWvvPKDwKYn1uwg0Kgf1JTWlFwq5C73EG3Q6Vb6ExNPaX/GMDkpi0Km5p2/BIM/jyCmCH+ScFRCtzJoxEg3L7BFdCKgY1bQW2pZDMRQ9nc32+EDUGQQbYp44/8mr4mXqDYV4VElZTqWZ6hJZk1cS7hustO8lJE3Yykp+q/5I0cq7fxe5aLBO5DwTPq9EY/dlcTy8z09Itm/AcJuCipg4I0nQ1cSDTNYn+4NVxoga/yS3gJlU5euXKmcaK9SaRCBIHtWR/Semza3Imvgtgd25bwKI+6VT/fHgqgmvo184NZID099w2E90eE= sgran's root key for debian.org machines
 # jcristau
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCy6ZvBw8WOaCCVlbzvThJtTey/ei32mHHaaSBvD1E/pQfvvpx5688F8DulMSEL3gsNa9q0n3bnAyG/d0E6PcLbXGiQbTVWpGB4dHpdIJ1LTL3XKeNDVQLQZ+2X0t251JnKGCbEVLinQtwf9WokDZxX0JhcZryM2bQEHMtf7bkmrCxBGJmnsI3c6Gn+sHvtVCcsudkUYPdXNlXUBb/MTRJLx0An63Tj7nWypFexk8PSEI6UXFlv6ri/jAEqwE1JO6gBQUxp11E6STgJ7Dd3DVE47aoOPSaftejbQLzRJ7MfiA/spisIglb5wQoGbQN263Kuk6PKlSru/JoRdY1KQWoB jcristau's root key for debian.org
+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
 
 <%=
 
 machine_keys = []
-case fqdn
+case @fqdn
   when "storace.debian.org" then
     roles['dabackup_client'].each do |node|
       if allnodeinfo.has_key?(node)