re-add idefix as debian now, ssh still broken

5 files changed, 22 insertions, 4 deletions

diff --git a/files/nodes/idefix/idefix_ssh.pub b/files/nodes/idefix/idefix_ssh.pub
index f516733..896bd11 100644
--- a/files/nodes/idefix/idefix_ssh.pub
+++ b/files/nodes/idefix/idefix_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyiKOOKn2KobwF52SkXDUSB/cvbi00V8PrqFPCDELNvLI2GKAEYUuLg4kBS/e4I7DYpB6K1DnBUtAjoVvuNybDV8zVbb3MSUlwBL//7EqXeg/9ulMylBAKl4GhjmxXa5d9hMRigUeZ9e/Ocq3RJBQlHvsW4f9pX8FctWbz7GSAEzucy3QIIniSq1WgM1pK/JlQO7xPluD5e+u/djOckuwKPE76vn1y5dZbvVvIuZKKi5tSqfxY08Glbp5oyocrhim0O9h3DtkLxZeual1CXb0pXdqf0b7R8EJ9/zDkgQ4kSX5ELA2slJOgxbttsbuGozjMavPuDk4R+I9H2BohI8Yr
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 8061c48..df38cea 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -2,6 +2,6 @@
 # This file is automatically generated by the command `leap`. You should NOT modify this file.
 # Instead, rerun `leap node init` on whatever node is causing SSH problems.
 #
-idefix,idefix.pano.leap.i,idefix.pano.leap.se,217.197.90.63 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyiKOOKn2KobwF52SkXDUSB/cvbi00V8PrqFPCDELNvLI2GKAEYUuLg4kBS/e4I7DYpB6K1DnBUtAjoVvuNybDV8zVbb3MSUlwBL//7EqXeg/9ulMylBAKl4GhjmxXa5d9hMRigUeZ9e/Ocq3RJBQlHvsW4f9pX8FctWbz7GSAEzucy3QIIniSq1WgM1pK/JlQO7xPluD5e+u/djOckuwKPE76vn1y5dZbvVvIuZKKi5tSqfxY08Glbp5oyocrhim0O9h3DtkLxZeual1CXb0pXdqf0b7R8EJ9/zDkgQ4kSX5ELA2slJOgxbttsbuGozjMavPuDk4R+I9H2BohI8Yr
+idefix,idefix.pano.leap.i,idefix.pano.leap.se,217.197.90.63 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F
 pano,pano.pano.leap.i,pano.pano.leap.se,37.218.240.163 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXVLLAXvR/g/HAdjK2d3MlH1VO6dxyzyQQI9aAnKTaKGN8OBl86cZf6cjkba/903gF7/j5Ou0pWcU+XHslV+RIqyhE8lErRaJt7XMTdC3LFEViR27F9ZzJ+rWKlRrVyczbN1vRX+257pacAMZE47TPWT6w630TfEoErFq86K1JaXveSzYboso74RttgTDJwpqgY+wjSvcjuHFPEzNyuu1Lb6OrAkf4twklBkamBqnCi3PeGsWsIFoqnEluNotqX0ajdxKPWDEcFWoaOShbfZgkiPEEaXkq6fn++A9rjxfZ4tJ2Xaxmv1MTV+IojxqDXzO9PnznoCojuzEGwStvQ4+P
 ramix,ramix.pano.leap.i,ramix.pano.leap.se,199.119.112.92 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YrOap4uVDRWvBx1kgk582m2UKAu7yClthVLQxHLxFwYYZvEFOZxpUKvhpLubDzjTnH8+iQ3euhPdr2hYwiyzJoc+GRF7msxV3PxH7Lmo56sqgubDOMhvVPBe2F+LSCqJ71TX+JybXAic/EFviJRwW9nFNoFTezUXcbOuXQGM3GF1guSDRkf3Wt4ZutngksJaPrAx5iU/celHvbx6NhFmE5LrjAQnjtxR9KErRSES98Y3Iuis+qk2FM43tw/raj2tj71fb4UhSvHoWF7GUZ/Z5iVEDvmawAmXsIi2YhI8CCe4/e+AS2f/ouKeKPeKJArSzrd4qV/tGtoyun2GkQN3
diff --git a/hiera/idefix.yaml b/hiera/idefix.yaml
index 77d9c35..e3f5d68 100644
--- a/hiera/idefix.yaml
+++ b/hiera/idefix.yaml
@@ -17,7 +17,7 @@ environment: ~
 firewall: 
   ssh: 
     from: sysadmin
-    port: 22
+    port: 22001
     to: "217.197.90.63"
   stunnel: []
 hosts: 
@@ -26,7 +26,7 @@ hosts:
     domain_internal: idefix.pano.leap.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyiKOOKn2KobwF52SkXDUSB/cvbi00V8PrqFPCDELNvLI2GKAEYUuLg4kBS/e4I7DYpB6K1DnBUtAjoVvuNybDV8zVbb3MSUlwBL//7EqXeg/9ulMylBAKl4GhjmxXa5d9hMRigUeZ9e/Ocq3RJBQlHvsW4f9pX8FctWbz7GSAEzucy3QIIniSq1WgM1pK/JlQO7xPluD5e+u/djOckuwKPE76vn1y5dZbvVvIuZKKi5tSqfxY08Glbp5oyocrhim0O9h3DtkLxZeual1CXb0pXdqf0b7R8EJ9/zDkgQ4kSX5ELA2slJOgxbttsbuGozjMavPuDk4R+I9H2BohI8Yr"
     ip_address: "217.197.90.63"
-    port: 22
+    port: 22001
   pano: 
     domain_full: pano.pano.leap.se
     domain_internal: pano.pano.leap.i
@@ -83,10 +83,16 @@ ssh:
     dawuud: 
       key: AAAAC3NzaC1lZDI1NTE5AAAAIO3x+WKRxugxWcuA2xuAOds5IJMMz229tdsuhjwrgrSp
       type: ssh-ed25519
+    elijah: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCke0b9xXn6F3WhQ6i9fN78RlQA0Dmxv1jAaZ1NGDTutl3V37hzXsKYtRPtbTERZg154OSY06jfgf/v5Gzpw0HPOu95S9zgUnMdSNlkLF2+cwK4Q/uj/1fHGOFIM1Q3Kjphwv0ssabVdAwMUt6n+beDysu0bLngw4lt4/dTTmrcxEcJTS2FPFD9rSp4NwYPTL4MMpcBQ4VxGDbWyx5dgbQLnH9kVoa+mO4aT31VX25GgJES+K2Rmd+TM95iRbvGHNg8kirAlMFfddIhjtIqNi67ninfF6gc5X8p39fbbeUpUJOWOKUvmCPprnMNXlFwQ6iFpkcA/XV6qi6zr/ObN9qfy6APbTrNv8HB1bWkDBZPrsB7PLvPAdFH7yOyIHRaowPhIoQG/jlCUbJbiT6Rg+vmLOUptu+Ei+Z466ajt3G54oHjUsjoWuHD+Qn2KZnY5r3WG1xL5r/NQPA4ybS8KVLftN6Fcojy1UjrL3AkbgCgu5S6y/6H2S3Tg1sq9YxjeQKuC1vhpW4Vkwmb6UXlckIOXmVIMAd3s9Jih8actG4m2zpj6mwT+qjBNKuzOEoyBEWaXvIXDZQ+DIHc+YEP8bNtVl5qkrBTvI0C+h+uinH2dY5yDFOYVWV2j0K/Nsnj2ploYPuxMpkcO0lly6Rjl+QvcAc1VIiuz4xK9e6nt36+3Q==
+      type: ssh-rsa
     kali: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
       type: ssh-rsa
     kwadronaut: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIBGRfVmBUpsLdFPae/ni0NYMbb5QR87MevNggi/wHHjl
+      type: ssh-ed25519
+    kwadronaut2: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     mavroudisv: 
diff --git a/hiera/pano.yaml b/hiera/pano.yaml
index d494c3a..62e29ea 100644
--- a/hiera/pano.yaml
+++ b/hiera/pano.yaml
@@ -87,10 +87,16 @@ ssh:
     dawuud: 
       key: AAAAC3NzaC1lZDI1NTE5AAAAIO3x+WKRxugxWcuA2xuAOds5IJMMz229tdsuhjwrgrSp
       type: ssh-ed25519
+    elijah: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCke0b9xXn6F3WhQ6i9fN78RlQA0Dmxv1jAaZ1NGDTutl3V37hzXsKYtRPtbTERZg154OSY06jfgf/v5Gzpw0HPOu95S9zgUnMdSNlkLF2+cwK4Q/uj/1fHGOFIM1Q3Kjphwv0ssabVdAwMUt6n+beDysu0bLngw4lt4/dTTmrcxEcJTS2FPFD9rSp4NwYPTL4MMpcBQ4VxGDbWyx5dgbQLnH9kVoa+mO4aT31VX25GgJES+K2Rmd+TM95iRbvGHNg8kirAlMFfddIhjtIqNi67ninfF6gc5X8p39fbbeUpUJOWOKUvmCPprnMNXlFwQ6iFpkcA/XV6qi6zr/ObN9qfy6APbTrNv8HB1bWkDBZPrsB7PLvPAdFH7yOyIHRaowPhIoQG/jlCUbJbiT6Rg+vmLOUptu+Ei+Z466ajt3G54oHjUsjoWuHD+Qn2KZnY5r3WG1xL5r/NQPA4ybS8KVLftN6Fcojy1UjrL3AkbgCgu5S6y/6H2S3Tg1sq9YxjeQKuC1vhpW4Vkwmb6UXlckIOXmVIMAd3s9Jih8actG4m2zpj6mwT+qjBNKuzOEoyBEWaXvIXDZQ+DIHc+YEP8bNtVl5qkrBTvI0C+h+uinH2dY5yDFOYVWV2j0K/Nsnj2ploYPuxMpkcO0lly6Rjl+QvcAc1VIiuz4xK9e6nt36+3Q==
+      type: ssh-rsa
     kali: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
       type: ssh-rsa
     kwadronaut: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIBGRfVmBUpsLdFPae/ni0NYMbb5QR87MevNggi/wHHjl
+      type: ssh-ed25519
+    kwadronaut2: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     mavroudisv: 
diff --git a/hiera/ramix.yaml b/hiera/ramix.yaml
index 57eaa22..7d046b6 100644
--- a/hiera/ramix.yaml
+++ b/hiera/ramix.yaml
@@ -91,10 +91,16 @@ ssh:
     dawuud: 
       key: AAAAC3NzaC1lZDI1NTE5AAAAIO3x+WKRxugxWcuA2xuAOds5IJMMz229tdsuhjwrgrSp
       type: ssh-ed25519
+    elijah: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCke0b9xXn6F3WhQ6i9fN78RlQA0Dmxv1jAaZ1NGDTutl3V37hzXsKYtRPtbTERZg154OSY06jfgf/v5Gzpw0HPOu95S9zgUnMdSNlkLF2+cwK4Q/uj/1fHGOFIM1Q3Kjphwv0ssabVdAwMUt6n+beDysu0bLngw4lt4/dTTmrcxEcJTS2FPFD9rSp4NwYPTL4MMpcBQ4VxGDbWyx5dgbQLnH9kVoa+mO4aT31VX25GgJES+K2Rmd+TM95iRbvGHNg8kirAlMFfddIhjtIqNi67ninfF6gc5X8p39fbbeUpUJOWOKUvmCPprnMNXlFwQ6iFpkcA/XV6qi6zr/ObN9qfy6APbTrNv8HB1bWkDBZPrsB7PLvPAdFH7yOyIHRaowPhIoQG/jlCUbJbiT6Rg+vmLOUptu+Ei+Z466ajt3G54oHjUsjoWuHD+Qn2KZnY5r3WG1xL5r/NQPA4ybS8KVLftN6Fcojy1UjrL3AkbgCgu5S6y/6H2S3Tg1sq9YxjeQKuC1vhpW4Vkwmb6UXlckIOXmVIMAd3s9Jih8actG4m2zpj6mwT+qjBNKuzOEoyBEWaXvIXDZQ+DIHc+YEP8bNtVl5qkrBTvI0C+h+uinH2dY5yDFOYVWV2j0K/Nsnj2ploYPuxMpkcO0lly6Rjl+QvcAc1VIiuz4xK9e6nt36+3Q==
+      type: ssh-rsa
     kali: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
       type: ssh-rsa
     kwadronaut: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIBGRfVmBUpsLdFPae/ni0NYMbb5QR87MevNggi/wHHjl
+      type: ssh-ed25519
+    kwadronaut2: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
       type: ssh-rsa
     mavroudisv: