diff --git a/.gitignore b/.gitignore index b251308..db3080e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ result result-* gcroots/ ca +configuration.nix diff --git a/rossby/fs-work/default.nix b/rossby/fs-work/default.nix index ac32b9f..12b5901 100644 --- a/rossby/fs-work/default.nix +++ b/rossby/fs-work/default.nix @@ -54,7 +54,7 @@ in { }; os = { - externalInterface = "enp129s0f0"; + externalInterface = "enp66s0np0"; nfs.enable = true; nfs.exports = '' /exports 172.16.239.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash) @@ -99,7 +99,7 @@ in { networking = { hostName = name; - interfaces.enp129s0f0 = { + interfaces.enp66s0np0 = { useDHCP = false; ipv4.addresses = [ { @@ -107,14 +107,25 @@ in { prefixLength = 24; } ]; - # ipv4.routes = [ - # { - # address = "172.16.239.0"; - # prefixLength = 24; - # via = "172.16.239.1"; - # } - # ]; }; + # interfaces.ibp1s0 = { + # useDHCP = false; + # ipv4.addresses = [ + # { + # address = ipoib; + # prefixLength = 24; + # } + # ]; + # }; + # interfaces.enp129s0f0 = { + # useDHCP = false; + # ipv4.addresses = [ + # { + # address = address; + # prefixLength = 24; + # } + # ]; + # }; defaultGateway = "172.16.239.1"; firewall = { allowedTCPPorts = []; diff --git a/rossby/login/default.nix b/rossby/login/default.nix index fea4bb2..76fade5 100644 --- a/rossby/login/default.nix +++ b/rossby/login/default.nix @@ -25,7 +25,7 @@ in automount.enable = true; users = false; opt = false; - work = true; + work = false; data = false; ceph = false; }; @@ -40,7 +40,7 @@ in myvnc.enable = false; os = { - externalInterface = "enp129s0f0"; + externalInterface = "enp65s0np0"; nfs.enable = true; nfs.exports = '' /exports 172.16.239.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash) @@ -108,12 +108,12 @@ in # ''; # boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6; - services.flannel.iface = "enp129s0f0"; + services.flannel.iface = "enp65s0np0"; networking = { useDHCP = false; hostName = name; - interfaces.enp129s0f0 = { + interfaces.enp65s0np0 = { useDHCP = false; ipv4.addresses = [ { inherit address; diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix index 08887a0..46afac0 100644 --- a/rossby/manage/default.nix +++ b/rossby/manage/default.nix @@ -50,8 +50,8 @@ in { users = true; opt = true; work = true; - data = false; - ceph = false; + data = true; + ceph = true; }; }; @@ -67,7 +67,7 @@ in { myvnc.enable = false; os = { - externalInterface = "enp129s0f0"; + externalInterface = "enp65s0np0"; nfs.enable = false; nfs.exports = '' /exports 172.16.239.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash) @@ -140,12 +140,12 @@ in { services.kubernetes.apiserver.extraOpts = ''--oidc-client-id=9b6daef0-02fa-4574-8949-f7c1b5fccd15 --oidc-groups-claim=roles --oidc-issuer-url=https://login.microsoftonline.com/3f737008-e9a0-4485-9d27-40329d288089/v2.0''; - services.flannel.iface = "enp129s0f0"; + services.flannel.iface = "enp65s0np0"; networking = { useDHCP = false; hostName = name; - interfaces.enp129s0f0 = { + interfaces.enp65s0np0 = { useDHCP = false; ipv4.addresses = [ { inherit address;