Set correct interface name for beefy.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
{
|
{
|
||||||
# Cluster node configuration
|
# Cluster node configuration
|
||||||
# Extends minimal-node with cluster-specific services (Consul, GlusterFS, CIFS, NFS)
|
# Extends minimal-node with cluster-specific services (Consul, GlusterFS, CIFS, NFS)
|
||||||
@@ -11,7 +11,14 @@
|
|||||||
./nfs-services-client.nix # New: NFS client for /data/services
|
./nfs-services-client.nix # New: NFS client for /data/services
|
||||||
];
|
];
|
||||||
|
|
||||||
# Wait for eno1 to be routable before considering network online
|
options.networking.cluster.primaryInterface = lib.mkOption {
|
||||||
# (hosts with different primary interfaces should override this)
|
type = lib.types.str;
|
||||||
systemd.network.wait-online.extraArgs = [ "--interface=eno1:routable" ];
|
default = "eno1";
|
||||||
|
description = "Primary network interface for cluster communication (Consul, NFS, etc.)";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
# Wait for primary interface to be routable before considering network online
|
||||||
|
systemd.network.wait-online.extraArgs = [ "--interface=${config.networking.cluster.primaryInterface}:routable" ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ in
|
|||||||
services.consul = {
|
services.consul = {
|
||||||
enable = true;
|
enable = true;
|
||||||
webUi = true;
|
webUi = true;
|
||||||
interface.advertise = "eno1";
|
interface.advertise = config.networking.cluster.primaryInterface;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
client_addr = "0.0.0.0";
|
client_addr = "0.0.0.0";
|
||||||
datacenter = "alo";
|
datacenter = "alo";
|
||||||
|
|||||||
@@ -16,5 +16,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
networking.hostName = "beefy";
|
networking.hostName = "beefy";
|
||||||
|
networking.cluster.primaryInterface = "enp1s0";
|
||||||
services.tailscaleAutoconnect.authkey = "tskey-auth-k79UsDTw2v11CNTRL-oYqji35BE9c7CqM89Dzs9cBF14PmqYsi";
|
services.tailscaleAutoconnect.authkey = "tskey-auth-k79UsDTw2v11CNTRL-oYqji35BE9c7CqM89Dzs9cBF14PmqYsi";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,13 +21,11 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
networking.hostName = "chilly";
|
networking.hostName = "chilly";
|
||||||
|
networking.cluster.primaryInterface = "br0";
|
||||||
services.tailscaleAutoconnect.authkey = "tskey-auth-kRXS9oPyPm11CNTRL-BE6YnbP9J6ZZuV9dHkX17ZMnm1JGdu93";
|
services.tailscaleAutoconnect.authkey = "tskey-auth-kRXS9oPyPm11CNTRL-BE6YnbP9J6ZZuV9dHkX17ZMnm1JGdu93";
|
||||||
services.consul.interface.advertise = lib.mkForce "br0";
|
|
||||||
|
|
||||||
networking.useNetworkd = true;
|
networking.useNetworkd = true;
|
||||||
systemd.network.enable = true;
|
systemd.network.enable = true;
|
||||||
# Wait for br0 to be routable before considering network online
|
|
||||||
systemd.network.wait-online.extraArgs = [ "--interface=br0:routable" ];
|
|
||||||
# not useful and potentially a security loophole
|
# not useful and potentially a security loophole
|
||||||
services.resolved.llmnr = "false";
|
services.resolved.llmnr = "false";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user