summaryrefslogtreecommitdiff
path: root/accounts/gkleen@sif
diff options
context:
space:
mode:
Diffstat (limited to 'accounts/gkleen@sif')
-rw-r--r--accounts/gkleen@sif/default.nix2
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index d40b1c92..05cfc2c8 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -136,7 +136,7 @@ in {
136 KbdInteractiveAuthentication yes 136 KbdInteractiveAuthentication yes
137 UpdateHostKeys yes 137 UpdateHostKeys yes
138 GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" '' 138 GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" ''
139 @cert-authority *.mathinst.loc,*.math.lmu.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01 139 @cert-authority *.mathinst.loc,*.math.lmu.de,*.cipmath.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
140 ''} 140 ''}
141 141
142 Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null" 142 Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 8cc0f04e..f141ca8e 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -546,6 +546,7 @@
546 extraOptions = { 546 extraOptions = {
547 PasswordAuthentication = "yes"; 547 PasswordAuthentication = "yes";
548 KbdInteractiveAuthentication = "yes"; 548 KbdInteractiveAuthentication = "yes";
549 HostKeyAlgorithms = "+ecdsa-sha2-nistp256";
549 }; 550 };
550 }; 551 };
551} 552}