update x509 material cdev, unstable bitmask

9 files changed, 162 insertions, 162 deletions

diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 18f879b..b4209ce 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -173,8 +173,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index ffed04a..ae47cca 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -321,8 +321,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
@@ -606,10 +606,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIHCjCCBfKgAwIBAgISA8XQ2NCaupQVcP18FmtKmH5MMA0GCSqGSIb3DQEBCwUA
+      MIIHCzCCBfOgAwIBAgISBEPcW5PU3VTtTHcZ34Mhq8cwMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA3MDUxNjE4NTVaFw0x
-      ODEwMDMxNjE4NTVaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA5MjUwNTU5MzVaFw0x
+      ODEyMjQwNTU5MzVaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw
       vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z
       UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg
@@ -621,7 +621,7 @@ x509:
       chrJYNbivOAW4kBPxZXJwDmLSX8CA1W6Tj1AUB02yb+EDfuqSCNJ9lAe9hkCoDIP
       c5Ei7PJqy9UwJvrFCE2zYms98RFq0b4morFsH7jqfV1vtB1UgqhwZC5e8UoTIrO/
       74PLKdjx+48/JaXCZTqLEhCcvcwGQXHaunV98yd4xS0v3+5UjWxtPzqwDPBryq8A
-      tZVm/kfUH9MhzwIDAQABo4IDFzCCAxMwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+      tZVm/kfUH9MhzwIDAQABo4IDGDCCAxQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
       MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQs
       JD85ZNdyW6CMP/fI0IRmMhHtWjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
       86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
@@ -632,18 +632,18 @@ x509:
       AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
       IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
       dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-      eXB0Lm9yZy9yZXBvc2l0b3J5LzCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2ANt0
-      r+7LKeyx/so+cW0s5bmquzb3hHGDx12dTze2H79kAAABZGt0NFcAAAQDAEcwRQIh
-      AOeiCGPJV9jyplcG2x92aqIEbkEmCJdAfn/gKgEk+0SaAiBVHN5vrshtk1az1SCk
-      WVSfT7IHdlu8xpxL9X2eiB1AhgB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM
-      9OVFR/R4AAABZGt0NGQAAAQDAEYwRAIgarqro2KdTKYIBkWywVbJNTZXSfFEL2gP
-      gFDGeI8jWkUCIFBxb0Dlm3myu59NiGcN/fwOuaRaR/JAM3T4oCh+RQd5MA0GCSqG
-      SIb3DQEBCwUAA4IBAQBjOm5MQ4HDhbQUMFYKVxem+dMHwPYdkARcoX66kMn3JT2H
-      AgfDHpNoNdhATm6hvroxpsjEYdPwLTJQeDqf6ymoUuLbNvouecWnfigdHN+jpARS
-      1AnCbdl2Xwz718fcqAZuM9AwyUZPAT06Mdgv1UbCM+7zWq9LoDlFpYMGf6unWhAB
-      OcTVoX1HmADPkC9L4ickTuprMPa5b+P3mjh8ItTq1uZ3VgusRmU18MYtYOlUdE3f
-      4BGvR87JeB8cGw0WySjaYZ3AaMPvPoe/I4ZV14AL7Uw8nn4xwfH5OAHfQec/UwnR
-      Ysl6vxVTAiElBSt+War5Y39L5I2MBN8uc4alNgso
+      eXB0Lm9yZy9yZXBvc2l0b3J5LzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ANt0
+      r+7LKeyx/so+cW0s5bmquzb3hHGDx12dTze2H79kAAABZg+GqYoAAAQDAEcwRQIh
+      AIswPa/iqEYMNhQg4WUg022LejZLE3Gu1JVqS/VoLEE1AiBw9pfScnKnkG+bM9l3
+      G8kL3WibMlIh5b7Qm7jg7G4l8wB2ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM
+      9OVFR/R4AAABZg+Gq4AAAAQDAEcwRQIhAKcPAUkf3BQdiZBpr3vYjh/Ralxr+Ktw
+      wAAshVFzQ/vXAiAT9ff77+i5MSs78ebdvTlaGxbDPWwODOmC4/svHjnDVDANBgkq
+      hkiG9w0BAQsFAAOCAQEAEuxjhYTmizq/kLw2bhQ696z2Q7+eg6JMALncZLooAERF
+      8jVjc+RylvWycLO+u0NH6gq6WZuQ0ci8SoE3P/V1CTTSp52omDmxVXI6ueHGEgjy
+      y6J9kwiVSWsC3CAeBDPgqWqF/vjAy7dYkGuxJiLUuptoHPIFtoHbcirFP1+2Ujtp
+      IhE2Y1XkVhsFzCyIJ6ZEgk7eSIiGGw4Jd5XLSl5AisGeNu0YIDpjfF8GLFXrbeGU
+      5TLYF+jBGG3VyjXzKnWNcD7Ph1h1dUUZTZW0aEaLHZEuiAgZacSgIMnkRLjWTG+S
+      /ThbkiBgyl8XrNaXKvb8ZSTlVPr4nPH43QDMxLZ6qg==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 0a46301..b970915 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -171,8 +171,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 7faf424..8264566 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -113,8 +113,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
@@ -163,92 +163,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      A4ICAQCa3F5xFOIwGoR0o0mOke4G3PaPtoFTH2UeFwPuYME0WjLMYZvGFW9EPqMp
+      nmj3sxu9/I1TirT26ginpDq3Cc5KF+XSV80oWrWlHdf/1AYXUx5tBJXLZkJlhFu9
+      M3jAZCT4IivtQfkPQj+Kj9MKGB1qCKeud6tgFcgCvITqBmAZivXFZWBIkjX5s0cu
+      BJyDiVZZuFH2Y2TrpaylvTTQZUIpdhuPwImMl+VScIN/5BBrqtRlrKXHqgKn+e2W
+      7jvDdjZu9hoDyt6acAEe7cn8aez9ehPnW7yMkaahQPH+ylLzRpqgl+JBBoP0JxCA
+      a1G93E/X0P470UlG0n4gergT4dzEVotSG0bsHS1v7bDmcxquTSqkzcK7ijnUgJUt
+      dsH+J2ff8L33CaAm00sE/1qsEpGeNETm5B3UYDvtg8Ae9BVH1pjH6zXUbzw3+W6d
+      /kf0XS6+3thAa5dZs/2+HhVSCWICvX6HudPafSUVT1MJ8PDOEeF+KZAzQYr8uWxZ
+      YWwS27UEYop2HGzHkyk+UcQUZuWj+btdtp0+kgxQfbXJwmd4B30EsSwTvtkjzUW6
+      QrTHWhZcZD1xcPIFqowntzKbkFWdDhG3K3PXv4oSwXB4y4RA2Lp+zBxXMV+n0rpf
+      eRsM9/R5HYai7K9cT8kZfVeYbirdwkc4JjDTWrJDrmrkW85O1g==
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      MIIJKQIBAAKCAgEAw1QQXlFE7baJ54fJxgrgfDw0dRxg4vYsJZIglwAzQNipYVao
-      UVUlSW4h8vdV1Fonmtz8TgZEQG9IkFwt5tbBlGmJV77yKt5uhVGcrzR1agedQ6v6
-      2X81z1PzEBj527ajBu5UU/FtJcvLMWsk5Rn6N/cCpuKcnD6LrpxwpWBeSmDixb2L
-      +ukxTSOiLNbcZjVwAq3c3S0Tw+WKRxGG2KK6inpjg0PBVAhmzJLOycJN1uYA6hLK
-      NhQvJgk8yjr4ly88Pr33fAl5nmuFEUI4k4azWEog2JMi/rr+z6CMW3XQjgJ20kIp
-      w3wHGAxXTLKs+plMXQ0/4no2m8t6oZYb8G2brJ0H3aIybNzXXUWkkKtNxsEk3M3E
-      r+Gtn77W7fSLf0uwb1qrH7WUzfPpiQwnlvhj81xVnuSRyu8NibgiyRu7HCOyUUs1
-      QfcZClk9EbP0VrtuJUYopJcIKCS31jUyoPTCAU/0/7OiTb9Ogu5q132WBgd8L8tV
-      +o1QISPQoj6PLIbEGiXymyVwQC1QUPdqtPMeakEl1N8vAtQs+X0Xf7PLYg2dGm2E
-      moptTYnk2sqaPZEfoDLjla/YzY7uwsOPoyjOkOk5F78OzUzAQe7XreTFi/GVEarT
-      MG/h69Fnj4N4SS73QSjFkL0ZsZ/V9ugymiY9gJLe/qgKnlr9XmSmL+lXvlMCAwEA
-      AQKCAgA/7iG1XRAcZaRZPV5TDXhP8TySIAmt/ziPy3YTNiOQU9mMXFqW1DFyCTPf
-      XAihiihwTWfe+boZBNNRPHphlWSieLBVIdANK+Qsinun9JmBbKCSZ5Wg3jv0cdua
-      JzKQMQTG3faHyvsYZc1JjXHz8j6tVpFtobn0gZwiOF2+Iv55haBzbAiGxRA32TPZ
-      TTGx2keg+NrTIU/YzCYoAJqMCSbY8Bnl+qUqJd3PkzVPX+MuNPWTpza74HtWDavx
-      3L9EbFdhibeYx1kg+rwA3BW8Y1gLy6dYez/286k2t6t4u+TYtgHB65nTu6JuwotI
-      NSrckpQl2JJSRAHfmAe5H3JhjN5oW1HNBAcxUYLT77QGOVJ9w1uoy571XGCfQmyY
-      y89l+pQXMPRlqETUNuJvtMP5nEIDZsI08o/Qh49w1kKObAMgZmRvrR0UwaEhZYiW
-      ITJMftP7qQSHcVDA0Hx1yBUnYRXbYEFj8tNgWXftYdHyLsYVJX9Y1uFsD/dQ0+FO
-      cpC9dJH/faQnv/8RZr9lYrLsdow83tDrQWWuuWKUgnQyoxUPhiYQmlFPk/PhHqvz
-      m+dxmaskZybXTJvxnxisqtu9HioF+NdITepriJY41STJkKRY2yLMt0Roft+/Epm7
-      3TDw7yWNCq13a6KC45DefKTTYV6psu0fnWbv2xOWyYy61jWbgQKCAQEA+3NRcldR
-      5cdIgREpDT/6SZbKSSOoX29TOqWzmNHL56YkAXxqzm4bOiqKoCAuMCH1iOSuIVQL
-      irqDirYjx6m6qG37HdmBs6z7QUnsBA/b5UqQYpsakXV7DPbXwSaPnpIEA8fofqIy
-      yu5K4uEQipyVIr3AB2fP8ZrTy65vDNR4VPNfQ546QG4hPCfWI/NCFsMaSUp47/MC
-      g//ABHv2XO/9C63XFWiEyQTL5Ir7SrXjnrUk67U+EZKI7THzUuKeBfVNOgl+nyW9
-      254liKLlbL1MLsR/exXzO544AmlJ9c7ZTi0qDhBQD+0Zb+kpIxhuvLlL1aSFB+UH
-      CyuXcDWxcGefMwKCAQEAxtzL5YYdLTJvlbhzduZCBqKre3E1AwsONF/g0a+bQk/U
-      LfWy9ijE3qoTvzfDrKUycurw2VXRorgtnQV5TmqNW/zrGqjZ18vJgZKHE7u9A1eQ
-      PwrTEG5knDzx5Djy4FpgSGtjNG+DkHqVo+et+RsM1nbM4J5Jt6qx0giJURp95li8
-      zEdIC22o9RxmdtlxXQE2S8Kze+LMsdW+gdYrtT2P+2Y4MUyKjr1ltkkdA04A5otA
-      48wvhizkYLCRbs8nV5xGurMtRKMIrMMX8XcVgKBT0Uii3tUKLggZ2Ky0RdQ7xR5x
-      VAM1ikchjhfKxKgrMeyG1Mcbhp+xNcK3l9sE0onkYQKCAQEAyivE/48PrRUWyZdX
-      j2yyO3q++CFwXhMvMwdJqIR+Uql1Z7B2W7WRtKnBvc9B87dKKJ/dFbTydr9RxjR9
-      /ioMhyGudyiLrUBW3/6kgfuSTQAvqOiWav+vSRQrEwSDEvbJvZR87VxSRHFlypc0
-      6o3NJxqzjAC+474drjV42jL28S6gmMheg7FIjYpmFY+fwpdpyiXTqPGVQzZdV/2n
-      bsASj9JdDbx0jv+JRB8uvroR4mg44D9gQVa1OykfP7QvZBD/37sEkMcSqMK14O9A
-      Uba9yxh4eymB4Jxs4htvuPBwLfgISTh6duOmwSERz0L0vk6pl4Po5hkSGbwZzcGO
-      Ahd+mwKCAQACBJGJFbBMGhvpwAJj7Xg0CwiEaySnkEAnpeVpG0gPBzJW+QxE1SsS
-      O1WR9iXlJZP6eInTGrzS0t2bn0eY1Rn0Gf/kuFvlharYxrzaJWiIlSXgjeKQYx5g
-      O3oU38MPJbueYICUMqF6INRN4nbwdSbPMktn6BNFatT9FZsXGJa4dKQNypdfjlBN
-      lGkxwYkV8YI0iJg7pJSBJXMWbC7rWuGQInxle6pYQnG6xMknlG4L6NPSu+qriN8U
-      YBZJso5qpCpPkKvf62uWHTCsAZJVSMsw73S/oBfHWcuxWCdIIhwtJt7thE7RxWEA
-      yRsEndQ6YHUJya9s0UgCDKTCRLWq0T1hAoIBAQC1ER4ishx9c5+b4TjU0p6PQrBc
-      fD5sX4goQDZLyDye+OqrQnT3rGxP3pBuDAJ8mr29PoeoIvfiL17IP9mk28FRJSql
-      rTreC2uPVfeMnNruNoYKke5JN6bbGYPdAG7EgCEh87E2ixtklIF0Fp4eBqRKy1SG
-      VGEHHeyXOWtoL0qShqrSHxPG+D6Alcl7iEOgIczE4k/HK1OQGCWzDKuV1kcdutPq
-      5lQ7ApbjSu8K9AyqYqDYSjih6bjlix78nyOQh2RvZ55lsgtiWN3JZiOVjsvGGdEk
-      YOmMYHEls/ErFwXYCs6GjAWAEy1+cmtt51MbbaQ4V5b72uulE/LFxdXrH2ou
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index e644173..aeb97e9 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -121,8 +121,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
@@ -169,10 +169,10 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIHATCCBemgAwIBAgISBPphnq+zgoOpK5apI/e+vhImMA0GCSqGSIb3DQEBCwUA
+          MIIHADCCBeigAwIBAgISBBGRLrAUlC2UsUnf9AiKazqJMA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA3MDUwNzAyMzFaFw0x
-          ODEwMDMwNzAyMzFaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA5MjUwNjA0MzNaFw0x
+          ODEyMjQwNjA0MzNaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
           9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
           R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
           0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -184,7 +184,7 @@ static:
           y1w5Vnlq3mgMY1JrdQB7Y2793v9HbFmp1y5XEsSvVHQ5qth4SrqreAdliGm7vq3+
           fuLfofwcOBr/WzEANRS88S71+hZND9ovRHkQe/IbxuEiE9O8arZfaIUmYB6d7Bq+
           l3Gf26ZIc0Ry9FuD41qXpEpbJzOOmLgq1dtFDWINTw5wddsMfybu/kCQCzK/vNHK
-          fgQNYbkCAwEAAaOCAxMwggMPMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+          fgQNYbkCAwEAAaOCAxIwggMOMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
           BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUpEePWFxF
           6YjQYtz5LxqX31AJ/18wHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEw
           bwYIKwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMu
@@ -195,18 +195,18 @@ static:
           aXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24gYnkgUmVseWlu
           ZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgQ2VydGlm
           aWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5cHQub3JnL3Jl
-          cG9zaXRvcnkvMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHcA23Sv7ssp7LH+yj5x
-          bSzluaq7NveEcYPHXZ1PN7Yfv2QAAAFkaXbPGQAABAMASDBGAiEA2cBaSW756K8y
-          7DHTVgxwYPyMY8zbSWZNz4WFVYoXwdICIQDxjBAi4A7JMHP5Jq9iM6y9W3jjAvQx
-          UNPqMv0QlyPQdgB1ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM9OVFR/R4AAAB
-          ZGl2zvEAAAQDAEYwRAIgStaiJqxu4q5f6GwTxV1gq1NG8SIaOn/tSogge3bJ0+gC
-          IBvhwqKhKJH/kDS5K65/fx8lNmOnLgfafOD4Kvk9rRpMMA0GCSqGSIb3DQEBCwUA
-          A4IBAQCW+tPgwfgZT7LO4VML847UdTBImqgyn7RCTnQ55VOyYWO7CC5Jiy7HHD6P
-          9aajz0RbVksng7MjxDincrWhJyaucC2hnpv0JH9mAq7TQXk6/PzRihZCF2XZEXuf
-          tsdHnDkro6YpMm7iOAhuMFu/5SklTQx3WtNcD/8Jq/OvWk3qemLGXUBIM+FlvRPk
-          dBcw/aSbsjMygdOR2Bmf+LyLdqf5PnJzE+KFF6TYkM+qCKrs/OiIWWd55fcrs3R0
-          /7BOntm0w5YTW2u7YvshmD3g0dl7ig1f4ikXCqclu1NWcBLiMckPd0qSpi8iX+j6
-          8wTKnxRT8W9xlSBF/GKT3yNLokld
+          cG9zaXRvcnkvMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYA23Sv7ssp7LH+yj5x
+          bSzluaq7NveEcYPHXZ1PN7Yfv2QAAAFmD4s04wAABAMARzBFAiAc0LFXe7AytYKC
+          J9AzfUA+tAUp7QmSfgUna2pGwRXyVAIhAJPiy/n/yCY+XqqarC7zoxg29ZhKKA3N
+          R4sxOGXROpm9AHUApFASaQVaFVReYhGrN7wQP2KuVXakXksXFEU+GyIQaiUAAAFm
+          D4s05AAABAMARjBEAiBu3lD8oIc/MQ0tSuiD9A1p+YXHig+9Q0e83sFqlFA1UwIg
+          ery4kjGHUtZpQtmXHFg/yK3L90zGxqjmEmyeCVwAM5YwDQYJKoZIhvcNAQELBQAD
+          ggEBAGtY+S0c/3JquvCnalshRzm2Yqmh22z45u6TzNc8yuI+4Yi3LgHvlv19+r45
+          ZZbuKP1DpZP3UXqDa925vNG6XY92AaD0Ai8U0Ufgpf78Ni6ek1L9zauDarOV+Nwt
+          /uw4PeJ5q5F6n+yQfK72UnATunjrHwk3wNUpIofBXqbjKygBpEncnhZaoBR6jgns
+          ptzhuZNi1145czKvcu/MjJs0H4ZTd5liIMUz1WZMR7XxbIYCpiOxsd0Jsi58kVSI
+          rM2FcM0Q+NUha9MlX9p3rBcxRYtKfb32NFy00Y6kVkJknVYbcwltdVoWttjDSR7Z
+          L5eimnWPTP7uu21qgT5bW6XvKEY=
           -----END CERTIFICATE-----
           -----BEGIN CERTIFICATE-----
           MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 8b119f4..3d7e15f 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -527,8 +527,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   monitor: 
@@ -832,10 +832,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIHEjCCBfqgAwIBAgISBAf8R/L7z4VgGfK0KfDhblnZMA0GCSqGSIb3DQEBCwUA
+      MIIHEzCCBfugAwIBAgISBAydm3QF8SDDjvRTS5op9KtqMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA3MDUxNDEzMjJaFw0x
-      ODEwMDMxNDEzMjJaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA5MjUwNjE0MDBaFw0x
+      ODEyMjQwNjE0MDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
       IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
       /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
       IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
@@ -847,7 +847,7 @@ x509:
       SMHJ1aiF7oNrzUzl5cITkPFtjsc1Kf8gAb4SRR0lN1Ty9YINH/c2YGFqfHyqdwZw
       CGILXXp6ryiud50aPIMyGWKWedzyeKssk8eXMoHHFCa490Ux2QVlIn9QayNsJCXX
       LJ8VpCxA2E3PWB14MoP0Qq7Hm9FFBncYSjEN6IH62TTOUZDqmzeWQvkxGSKQbZ7z
-      FQISXPFJ/aPQoHfYAGkCAwEAAaOCAxswggMXMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+      FQISXPFJ/aPQoHfYAGkCAwEAAaOCAxwwggMYMA4GA1UdDwEB/wQEAwIFoDAdBgNV
       HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
       FgQUl9o/MaPxASJRbiGJucZoNMTa3kswHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3
       pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2Nz
@@ -858,18 +858,18 @@ x509:
       BggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVs
       aWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFu
       Y2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8v
-      bGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMIIBAwYKKwYBBAHWeQIEAgSB9ASB
-      8QDvAHYAVYHUwhaQNgFK6gubVzxT8MDkOHhwJQgXL6OqHQcT0wwAAAFkawFDRgAA
-      BAMARzBFAiBTQETfA+RMpB6gNZBTWmjtnNFj3H8nRNNIE/IUSC/jIAIhAIXIbXCa
-      fudtzwofLvzyBsCVOmBe/+rcAVyrkdz4w080AHUAKTxRllTIOWW6qlD8WAfUt2+/
-      WHopctykwwz05UVH9HgAAAFkawFDMQAABAMARjBEAiBIz+ra4ZndI3pXgZRlYwme
-      G9z5Zz5gZSM2DNXCcwGWbgIgIFMrBbeymWHZstCDFu8na+8DvF4KYpzjjHCZTAy8
-      AS8wDQYJKoZIhvcNAQELBQADggEBAJYDawrXev5UihscaOrN5qx2cywl0EF5elg5
-      7HpYdM6XbjHps77gPb8EHplItawk2gqNpbfVlrjyimwi3ebirqGG8VkVnktXrmCR
-      i+dYdfcgE+gmJxJdux2wiP6WXMjexciCWvXC2xcBE+sqbHFnXIWg4vRvWTR6wfEG
-      B3uAZQVY+fjWtYwCrAlJTD7c6EntCHA+SiH5ZIy3/Xyx1DkJPBF941xR3/xLWCCT
-      ewSLINd5fJ6cbnwwTXlvlQjSApyI/Stzu4FrjC9ZM8TCM0FW6fr9OENBlOnbMihd
-      X9vs6RKMB20FQhRTKO2w5mQtyLaxCEyHLEZiH88G9H5u1NstFMc=
+      bGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMIIBBAYKKwYBBAHWeQIEAgSB9QSB
+      8gDwAHYAwRZK4Kdy0tQ5LcgKwQdw1PDEm96ZGkhAwfoHUWT2M2AAAAFmD5PdUQAA
+      BAMARzBFAiAw970Z+juPQihOdXBRmKlCyAOx7Vd/0/KGA6QXkkfVmAIhAJyCdezz
+      mYWl0j8d/qY14YIHl6pDf806EoOm/9IOWhiHAHYAKTxRllTIOWW6qlD8WAfUt2+/
+      WHopctykwwz05UVH9HgAAAFmD5PdSgAABAMARzBFAiEArW7dmbxLxRGKi18TKSno
+      J0qs95Qr/IIEAPnZxhhIHdACIF2ZcljDPuyZ54WdLaNPxGhvD2JVTSNUhYNROYuG
+      HaDiMA0GCSqGSIb3DQEBCwUAA4IBAQAQ4ip2fvR/7i6gtr+NvLfOVYf8/YM4Qijd
+      HdGw8gLtJCxeRLMrT+PXw9xigSSy5VGtBn7/R2IpDGf3E1boziUnbAw01TIqs62S
+      nxRImqc+FmgbToHThW27CZCX4GnY36bIn6f98ueYeZ7IDfl5VwJOMSo4DVj9LCM9
+      g1pNr8nha+wCDTWUE1VYPq3Hlwn6+GdpmhF5pFlM4bN9lYkiFCEqEw6vlyyoCfpF
+      IvENP1eakp4V505LsApZqC8TQnAMaLHajgJTUUbPVDqmKJzCbPmNrixQESZQEuHr
+      ut/VqcZ3775l8XVmO8kW50AnQ0utJm4DSTvDYa++Jn4cmfAPc5j2
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/giraffe.yaml b/hiera/giraffe.yaml
index dfa6fa4..2084d86 100644
--- a/hiera/giraffe.yaml
+++ b/hiera/giraffe.yaml
@@ -168,8 +168,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index 711c75e..9bb6860 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -285,8 +285,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: 
@@ -573,10 +573,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIHCzCCBfOgAwIBAgISBC3gnfsoOOIVpV80hdPKhXqRMA0GCSqGSIb3DQEBCwUA
+      MIIHDDCCBfSgAwIBAgISBN12ttnt3aiNyK/lyK04WGc2MA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA3MDUwNzAyMTJaFw0x
-      ODEwMDMwNzAyMTJaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA5MjUwNjA2MjdaFw0x
+      ODEyMjQwNjA2MjdaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
       SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
       hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
@@ -588,7 +588,7 @@ x509:
       gpCeQOASYKO7OAptFNbLdS0QROJSK4tuQmbMLgGDHV69iXHdnupWzaCSYVZLHOLB
       yMnLUz7YUHnONe5F8AnIEDSlDF9WqXSIJSY9zZsAZKI0vVdQTwNk6IDBzdQGHkuJ
       2f1JSD7JVcVGtjyyxD8+yHB/BkBqsudFSyt4hVtZVbEcn9soKsHYjuVX3ItaJ1Zn
-      WYfZkr+5L2O0bQIDAQABo4IDGDCCAxQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+      WYfZkr+5L2O0bQIDAQABo4IDGTCCAxUwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
       MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS0
       4pvDNSzeeFpBBjvRTQC/4Sl2CjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
       86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
@@ -599,18 +599,18 @@ x509:
       AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
       IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
       dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-      eXB0Lm9yZy9yZXBvc2l0b3J5LzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AFWB
-      1MIWkDYBSuoLm1c8U/DA5Dh4cCUIFy+jqh0HE9MMAAABZGl2hmoAAAQDAEgwRgIh
-      AJnJSGbBodvR7QMg0iF6clOErcz+zYhugTyGFdHEf/fnAiEA/5y8IsmrFUsL9WBg
-      3J2cu62Jy/Oz96gxSFHcdonUQjAAdQApPFGWVMg5ZbqqUPxYB9S3b79Yeily3KTD
-      DPTlRUf0eAAAAWRpdoZXAAAEAwBGMEQCIHf4nwyT3gNbyuCK6e0fSQy8pZTyfp2j
-      MG9JnEsIn83rAiArKMI7EgpIqUB5nXcSWPQwdm3QoKf46Ocq5CMnl8Y3rDANBgkq
-      hkiG9w0BAQsFAAOCAQEAmEyyUdHnpFBODcf+5IweAWDSaDaZnPuGScgzVh5UsaCH
-      gOBcwReElaktBoDsOLAWm4OMhEqELi1JJf8MZd8Rhbpm2lsMFkt+lxMgSfYZCU8w
-      qt+vuTs3N772Ocp55NuLoJcXN2AiDP1JnYyHwMXzPWeJYPSNKtXBLZZJJQbWBpzU
-      VrhXpGpvHGjCAtPNBPgFyLU/+pbGvy1ZdQCp+FNhby2fQX+Er2CBC1M7mJuQvyV+
-      MrnIZPElxL/9Nmo9Dyh4WR6nlErqkiP49ce+GAUskwnFloCXNpjl773FJgJIVoT6
-      MX/HIW23OzPdr9LPcxWfSkPP1HzpMmEgjL73OuYFqQ==
+      eXB0Lm9yZy9yZXBvc2l0b3J5LzCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB2AMEW
+      SuCnctLUOS3ICsEHcNTwxJvemRpIQMH6B1Fk9jNgAAABZg+M8o0AAAQDAEcwRQIh
+      AMgUw1mw+qXOiobKFdKgyPxUmeuzG/ct5VNBVOgjHFb3AiACn4P3pXb7L+WYq8Qq
+      njpisC/t+GskA3dLW1SiueQWLwB3ACk8UZZUyDlluqpQ/FgH1Ldvv1h6KXLcpMMM
+      9OVFR/R4AAABZg+M9HcAAAQDAEgwRgIhAM8tNHe0CwOTgo9tNju460jSWn8JY+cr
+      QVB03F8jS3fqAiEAhws3Jrzi8QiZj/EhWkaulp48sAYTiE4euzyuAiANLbUwDQYJ
+      KoZIhvcNAQELBQADggEBAIJEu/iuCqMXTXGTOeo6EpYweK/R14mOV+lUmbR6MG6g
+      Yme9vDM3nXxbiJP00gZBYVMbPlDSarl6XW0sK+KqMsHQempjbqGR/3gOGbACqK/+
+      Th7q3HxiPdG8O4VpsDu6fuQfBdgnFVltdfnD1iJWC/wK39XeuHfGeKx87Q1BsSq/
+      JwP4MRnfvDFt2GrGodjsTkBql1bco9ku3kw8gtvNvr02pAkjbMZ8sO48GvmD5EGF
+      JKmchIm8bepM9IeTpGVo67MrbRykRdSemR6g5bPns3EP3EqlH5d4SRa3gF5aoG5A
+      QUsDIf/LzhV6Z2DyGOF9U1/fvG9HnmHBPxTFmqjw3as=
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 5f79f4b..16f6a7d 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -146,8 +146,8 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
       type: ssh-rsa
     varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMCNpxJade7/MV0f58ntCfqcrNLzdB2+R4znsUYH+LS1
+      type: ssh-ed25519
   config: 
     AllowTcpForwarding: "no"
   mosh: