From fb7fe2437c17fb7e2e1d2e4cf7ab154d2aecadae Mon Sep 17 00:00:00 2001 From: Xavier Lagraula Date: Mon, 11 May 2026 16:36:34 +0200 Subject: [PATCH] refactor: move host-specific settings to hosts directory - Move defaultNameServers from network/dns.nix to hosts/servers/default.nix and hosts/workstations/default.nix - Move SMTP configuration from network/smtp.nix to hosts/servers/default.nix and hosts/workstations/default.nix - Move proxy configuration from network/proxy.nix to hosts/servers/default.nix and hosts/workstations/default.nix - Move NTP servers from network/time.nix to hosts/default.nix - Remove network/proxy.nix and network/smtp.nix (host-specific settings don't belong in network/) - Update network/default.nix to only import dns.nix and time.nix This refactoring separates environment-specific network parameters (domain, timezone) from host-specific settings (DNS servers, SMTP, proxy, NTP servers), making the configuration more logical and maintainable. --- environments/sample/hosts/servers/default.nix | 14 ++++++++------ .../hosts/{ => servers}/dns01/configuration.nix | 0 environments/sample/hosts/workstations/default.nix | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) rename environments/sample/hosts/{ => servers}/dns01/configuration.nix (100%) diff --git a/environments/sample/hosts/servers/default.nix b/environments/sample/hosts/servers/default.nix index a50502a..1265455 100644 --- a/environments/sample/hosts/servers/default.nix +++ b/environments/sample/hosts/servers/default.nix @@ -2,13 +2,13 @@ let # Import environment-specific network parameters - env = import ../../../network { }; + env = import ../../../../network { }; in { - # Common settings for all servers in the sample environment + # Common settings for all servers in the production environment # This file is imported by all server configurations # Default DNS servers for this environment - networking.nameServers = [ "10.40.128.10" ]; + networking.nameServers = [ "10.40.128.10" "10.40.128.11" ]; # SMTP relay configuration services.postfix = { @@ -16,12 +16,15 @@ in { relayHost = "smtp.lagraula.fr"; relayPort = 587; useTLS = true; - fromAddress = "noreply@sample.lagraula.fr"; + fromAddress = "noreply@prod.lagraula.fr"; }; # Proxy configuration for servers (none for now) environment.systemPackages = with pkgs; [ ]; + # Locale for servers (English) + i18n.defaultLocale = "en_US.UTF-8"; + # TODO: Move other common server settings here later # Examples: # - Server-specific users/groups @@ -29,5 +32,4 @@ in { # - Server-specific services # - Server-specific security policies # - Server-specific monitoring/alerting - # - Locale: en_US.UTF-8 (for servers) -} +} \ No newline at end of file diff --git a/environments/sample/hosts/dns01/configuration.nix b/environments/sample/hosts/servers/dns01/configuration.nix similarity index 100% rename from environments/sample/hosts/dns01/configuration.nix rename to environments/sample/hosts/servers/dns01/configuration.nix diff --git a/environments/sample/hosts/workstations/default.nix b/environments/sample/hosts/workstations/default.nix index f6e2324..590a179 100644 --- a/environments/sample/hosts/workstations/default.nix +++ b/environments/sample/hosts/workstations/default.nix @@ -2,13 +2,13 @@ let # Import environment-specific network parameters - env = import ../../../network { }; + env = import ../../../../network { }; in { - # Common settings for all workstations in the sample environment + # Common settings for all workstations in the production environment # This file is imported by all workstation configurations # Default DNS servers for this environment - networking.nameServers = [ "10.40.128.10" ]; + networking.nameServers = [ "10.40.128.10" "10.40.128.11" ]; # SMTP relay configuration services.postfix = { @@ -16,7 +16,7 @@ in { relayHost = "smtp.lagraula.fr"; relayPort = 587; useTLS = true; - fromAddress = "noreply@sample.lagraula.fr"; + fromAddress = "noreply@prod.lagraula.fr"; }; # Proxy configuration for workstations (none for now) @@ -32,4 +32,4 @@ in { # - Workstation-specific services # - Workstation-specific security policies # - Workstation-specific monitoring/alerting -} +} \ No newline at end of file