fix mail relay and add infiniband pkey

This commit is contained in:
Jonas Juselius
2022-08-18 10:36:06 +02:00
parent 4e30572bde
commit 3102c977b0
5 changed files with 119 additions and 18 deletions

View File

@@ -145,13 +145,19 @@ let
device = "/home";
options = [ "bind" ];
};
"/exports/opt" = {
device = "/opt";
"/stokes" = {
device = "/home";
options = [ "bind" ];
};
"/opt" = {
device = "10.1.63.80:/opt";
fsType = "nfs";
options = [ "soft" "rdma" "defaults" ];
};
"/data" = {
device = "10.1.63.80:/data";
fsType = "nfs";
options = [ "soft" "rdma" "defaults" ];
};
"/vol/local-storage/vol1" = {
device = "/vol/vol1";
@@ -245,6 +251,11 @@ let
];
};
# ssh-rsa is deprecated, but putty/winscp users use it
services.openssh.extraConfig = ''
pubkeyacceptedalgorithms ssh-rsa,ssh-ed25519-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,rsa-sha2-512,rsa-sha2-256
'';
imports = [ ./cluster.nix ./hw/frontend.nix ];
};
@@ -252,19 +263,34 @@ let
# deployment.tags = [ "compute" ];
fileSystems = {
"/home/stokes" = {
"/stokes" = {
device = "10.1.63.100:/home";
fsType = "nfs";
options = [
"soft"
"defaults"
"noauto"
"x-systemd.automount"
];
};
"/opt" = {
device = "10.1.63.100:/opt";
device = "10.1.63.80:/opt";
fsType = "nfs";
options = [ "soft" "rdma" "defaults" ];
};
"/data" = {
device = "10.1.63.80:/data";
fsType = "nfs";
options = [ "soft" "rdma" "defaults" ];
};
};
systemd.automounts = [
{
where = "/stokes";
wantedBy = [ "default.target" ];
}
];
};
mkCompute = host:
@@ -299,7 +325,7 @@ let
} ];
};
interfaces.ibp65s0 = {
interfaces.ibp65s0.2222 = {
useDHCP = false;
ipv4.addresses = [ {
address = ipoib;