refactor: Move network configurations to machine directories
- Move network-congenital-optimist.nix to machines/congenital-optimist/ - Move network-sleeper-service.nix to machines/sleeper-service/ - Update import paths in machine configurations - Clean up modules/network/common.nix to remove SSH duplication - Consolidate SSH configuration in modules/security/ssh-keys.nix - Remove machine-specific networking from shared common module This improves dependency tracking by co-locating machine-specific network configurations with their respective machines.
This commit is contained in:
parent
fff47629f2
commit
e976b14d19
6 changed files with 12 additions and 17 deletions
|
@ -7,7 +7,7 @@
|
|||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../modules/network/network-congenital-optimist.nix
|
||||
./network-congenital-optimist.nix
|
||||
|
||||
# Security modules
|
||||
../../modules/security/ssh-keys.nix
|
||||
|
|
21
machines/congenital-optimist/network-congenital-optimist.nix
Normal file
21
machines/congenital-optimist/network-congenital-optimist.nix
Normal file
|
@ -0,0 +1,21 @@
|
|||
# Networking Configuration - congenital-optimist
|
||||
# AMD Threadripper workstation network setup
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/network/common.nix
|
||||
];
|
||||
|
||||
# Machine-specific network configuration
|
||||
networking = {
|
||||
hostName = "congenital-optimist";
|
||||
hostId = "8425e349";
|
||||
networkmanager.enable = true;
|
||||
|
||||
# Additional firewall ports for workstation services
|
||||
firewall.allowedTCPPorts = [
|
||||
];
|
||||
};
|
||||
|
||||
}
|
|
@ -4,9 +4,9 @@
|
|||
# Security modules
|
||||
../../modules/security/ssh-keys.nix
|
||||
# Network configuration
|
||||
../../modules/network/network-sleeper-service.nix
|
||||
./network-sleeper-service.nix
|
||||
# Services
|
||||
../../modules/services/nfs.nix
|
||||
./nfs.nix
|
||||
../../modules/system/transmission.nix
|
||||
|
||||
# User modules - server only needs sma user
|
||||
|
|
61
machines/sleeper-service/network-sleeper-service.nix
Normal file
61
machines/sleeper-service/network-sleeper-service.nix
Normal file
|
@ -0,0 +1,61 @@
|
|||
# Networking Configuration - sleeper-service
|
||||
# Xeon file server network setup with systemd-networkd and static IPs
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/network/common.nix
|
||||
];
|
||||
|
||||
# Machine-specific network configuration
|
||||
networking = {
|
||||
hostName = "sleeper-service";
|
||||
hostId = "8425e349"; # Unique identifier for the machine - DO NOT CHANGE!!
|
||||
|
||||
# # Enable systemd-networkd for static networking
|
||||
# useNetworkd = false;
|
||||
# useDHCP = true;
|
||||
|
||||
# Disable NetworkManager in favor of systemd-networkd
|
||||
networkmanager.enable = true;
|
||||
|
||||
# DNS configuration - use Pi-hole server
|
||||
nameservers = [ "10.0.0.14" "8.8.8.8" ]; # Pi-hole server, Google DNS fallback
|
||||
|
||||
# Configure static IP for the main ethernet interface
|
||||
# interfaces.enp0s25 = {
|
||||
# useDHCP = false;
|
||||
# ipv4.addresses = [
|
||||
# {
|
||||
# address = "10.0.0.8"; # Static IP for sleeper-service (existing files.home machine)
|
||||
# prefixLength = 24;
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
|
||||
# Network gateway and DNS (based on nmap discovery)
|
||||
# defaultGateway = {
|
||||
# address = "10.0.0.138"; # Discovered router at lan.home
|
||||
# interface = "enp0s25"; # Main ethernet interface
|
||||
# };
|
||||
# nameservers = [ "10.0.0.14" "10.0.0.138" "8.8.8.8" ]; # Pi-hole, router, Google DNS fallback
|
||||
|
||||
# Additional firewall ports for file server services
|
||||
firewall.allowedTCPPorts = [
|
||||
22 # SSH
|
||||
111 # NFS portmapper
|
||||
2049 # NFS
|
||||
445 # SMB/CIFS
|
||||
139 # NetBIOS Session Service
|
||||
# Add additional ports here as needed
|
||||
];
|
||||
|
||||
firewall.allowedUDPPorts = [
|
||||
22 # SSH
|
||||
111 # NFS portmapper
|
||||
2049 # NFS
|
||||
137 # NetBIOS Name Service
|
||||
138 # NetBIOS Datagram Service
|
||||
];
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue