fix: add fs-work and etcd cluster

This commit is contained in:
2025-09-13 07:03:17 +02:00
parent 6767eb21e6
commit 3af5ba3fbd
8 changed files with 49 additions and 79 deletions

View File

@@ -8,7 +8,7 @@ let
# pkgs = import <nixpkgs> {};
etcdCluster = import ../etcdCluster.nix;
name = "fs-work";
address = "10.255.241.90";
address = "172.16.239.210";
in {
fs-work = { config, pkgs, ... }: with pkgs; {
deployment.tags = [ "fs" "fs-work" "cluster" ];
@@ -54,12 +54,10 @@ in {
};
os = {
externalInterface = "enp33s0f3np3";
externalInterface = "enp129s0f0";
nfs.enable = true;
nfs.exports = ''
/exports 10.255.241.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash)
/exports 10.255.243.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash)
/exports 10.255.244.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash)
/exports 172.16.239.0/24(insecure,rw,async,no_subtree_check,crossmnt,fsid=0,no_root_squash)
'';
};
@@ -101,7 +99,7 @@ in {
networking = {
hostName = name;
interfaces.enp65s0f0np0 = {
interfaces.enp129s0f0 = {
useDHCP = false;
ipv4.addresses = [
{
@@ -109,40 +107,20 @@ in {
prefixLength = 24;
}
];
ipv4.routes = [
{
address = "10.255.242.0";
prefixLength = 24;
via = "10.255.241.100";
}
];
};
interfaces.enp1s0f1np1 = {
useDHCP = false;
ipv4.addresses = [
{
address = "10.255.244.90";
prefixLength = 24;
}
];
};
# interfaces."ibp65s0.7666" = {
# useDHCP = false;
# };
interfaces.ibp1s0f0 = {
useDHCP = false;
ipv4.addresses = [
{
address = "10.255.243.90";
prefixLength = 24;
}
];
# ipv4.routes = [
# {
# address = "172.16.239.0";
# prefixLength = 24;
# via = "172.16.239.1";
# }
# ];
};
defaultGateway = "172.16.239.1";
firewall = {
allowedTCPPorts = [];
allowedUDPPorts = [];
extraCommands = ''
# iptables -t nat -A POSTROUTING -s 10.255.243.0/24 -j MASQUERADE
# iptables -t nat -A POSTROUTING -s 172.16.239.0/24 -j MASQUERADE
'';
};
};
@@ -154,10 +132,6 @@ in {
device = "/work";
options = [ "bind" ];
};
"/exports/opt" = {
device = "/opt";
options = [ "bind" ];
};
};
programs.singularity.enable = true;