diff --git a/README.md b/README.md index d3310e7..dcaa86c 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Ce dépôt stocke une configuration générique des machines. * mettre à jour les dépôts avec les dernières versions, `make submodules-update` * vérifier que `configuration.nix` contient `services.xserver.enable = true;` pour les machines avec interface graphique * vérifier que `configuration.nix` contient le nom de la machine `networking.hostName = "";` +* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "";` * tester la configuration : `nixos-rebuild build` * corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` ) * lorsque tout semble bon, vérifier : diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix index bfc6681..e213860 100644 --- a/applications/graphical/adminsys.nix +++ b/applications/graphical/adminsys.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index 1438c0e..228d80c 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix index fbc2a8c..8fab7d9 100644 --- a/applications/graphical/bureautique.nix +++ b/applications/graphical/bureautique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/cao.nix b/applications/graphical/cao.nix index a3d2a6d..43db259 100644 --- a/applications/graphical/cao.nix +++ b/applications/graphical/cao.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/cartographie.nix b/applications/graphical/cartographie.nix index 4c3d269..cb18604 100644 --- a/applications/graphical/cartographie.nix +++ b/applications/graphical/cartographie.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix index 750aeaf..688aaf6 100644 --- a/applications/graphical/client-internet.nix +++ b/applications/graphical/client-internet.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix index 659131d..7f75276 100644 --- a/applications/graphical/default-applications.nix +++ b/applications/graphical/default-applications.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix index cdcdfc7..75e111e 100644 --- a/applications/graphical/default.nix +++ b/applications/graphical/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix index f37bc7b..c0b7123 100644 --- a/applications/graphical/developpement-elm.nix +++ b/applications/graphical/developpement-elm.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix index 3257559..ae2157e 100644 --- a/applications/graphical/developpement-haskell.nix +++ b/applications/graphical/developpement-haskell.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix index 2b830f3..c43280d 100644 --- a/applications/graphical/developpement-java.nix +++ b/applications/graphical/developpement-java.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix index b42320a..0a5f154 100644 --- a/applications/graphical/developpement-jetbrains.nix +++ b/applications/graphical/developpement-jetbrains.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix index 0b6f0b4..f9ede33 100644 --- a/applications/graphical/developpement-rust.nix +++ b/applications/graphical/developpement-rust.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix index 51b8af2..5d68fb2 100644 --- a/applications/graphical/developpement.nix +++ b/applications/graphical/developpement.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/edition-musique.nix b/applications/graphical/edition-musique.nix index 2d04441..3329821 100644 --- a/applications/graphical/edition-musique.nix +++ b/applications/graphical/edition-musique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/edition-photo.nix b/applications/graphical/edition-photo.nix index e0573ad..c731c6b 100644 --- a/applications/graphical/edition-photo.nix +++ b/applications/graphical/edition-photo.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix index 61f9a2b..124a911 100644 --- a/applications/graphical/edition-video.nix +++ b/applications/graphical/edition-video.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix index d426081..b126e59 100644 --- a/applications/graphical/jeux.nix +++ b/applications/graphical/jeux.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix index 1ea891a..3b2d0b8 100644 --- a/applications/graphical/multimedia.nix +++ b/applications/graphical/multimedia.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix index 80cedb2..b3a6277 100644 --- a/applications/graphical/network.nix +++ b/applications/graphical/network.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix index 05bbaed..c0a6b3d 100644 --- a/applications/graphical/radio.nix +++ b/applications/graphical/radio.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix index 543c611..4fd424d 100644 --- a/applications/graphical/securite.nix +++ b/applications/graphical/securite.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/overrides.nix b/applications/overrides.nix index 756c730..56d314e 100644 --- a/applications/overrides.nix +++ b/applications/overrides.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index a66799a..92e6bb6 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix index 02337b1..a68eb59 100644 --- a/applications/terminal/bureau.nix +++ b/applications/terminal/bureau.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index f594437..d30cfc2 100644 --- a/applications/terminal/bureautique.nix +++ b/applications/terminal/bureautique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix index 30f33c9..b40b88d 100644 --- a/applications/terminal/cao.nix +++ b/applications/terminal/cao.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix index f748045..aa76d40 100644 --- a/applications/terminal/cartographie.nix +++ b/applications/terminal/cartographie.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix index 7ee9da1..2b9445f 100644 --- a/applications/terminal/client-internet.nix +++ b/applications/terminal/client-internet.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 05bec37..1db9a37 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix index cdcdfc7..75e111e 100644 --- a/applications/terminal/default.nix +++ b/applications/terminal/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-elm.nix b/applications/terminal/developpement-elm.nix index 01a604b..3782c50 100644 --- a/applications/terminal/developpement-elm.nix +++ b/applications/terminal/developpement-elm.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index 6425bb2..9889fee 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix index c347694..4062b11 100644 --- a/applications/terminal/developpement-java.nix +++ b/applications/terminal/developpement-java.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix index ff91e67..79ba128 100644 --- a/applications/terminal/developpement-jetbrains.nix +++ b/applications/terminal/developpement-jetbrains.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index 40a6750..b6981f1 100644 --- a/applications/terminal/developpement-rust.nix +++ b/applications/terminal/developpement-rust.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix index dab2fa1..1f45c8f 100644 --- a/applications/terminal/developpement.nix +++ b/applications/terminal/developpement.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/edition-musique.nix b/applications/terminal/edition-musique.nix index cead741..6344c61 100644 --- a/applications/terminal/edition-musique.nix +++ b/applications/terminal/edition-musique.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix index dc14969..89dacf9 100644 --- a/applications/terminal/edition-photo.nix +++ b/applications/terminal/edition-photo.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix index af23cb8..8a375e4 100644 --- a/applications/terminal/edition-video.nix +++ b/applications/terminal/edition-video.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/jeux.nix b/applications/terminal/jeux.nix index 2f1aa79..615f422 100644 --- a/applications/terminal/jeux.nix +++ b/applications/terminal/jeux.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix index 717b9fb..4ca10aa 100644 --- a/applications/terminal/multimedia.nix +++ b/applications/terminal/multimedia.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix index 9e9c263..1a9a9db 100644 --- a/applications/terminal/network.nix +++ b/applications/terminal/network.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/radio.nix b/applications/terminal/radio.nix index 2b70407..d7f52b8 100644 --- a/applications/terminal/radio.nix +++ b/applications/terminal/radio.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/applications/terminal/securite.nix b/applications/terminal/securite.nix index a03980e..eca7959 100644 --- a/applications/terminal/securite.nix +++ b/applications/terminal/securite.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/config-generator.nix b/config-generator.nix index 92ddc96..891db05 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -5,9 +5,9 @@ let cfg = config.r6d.config-generator; pfl = config.r6d.profiles; comp = config.r6d.computers; - host = config.networking.hostName; + host = config.networking.fqdn; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in @@ -43,7 +43,8 @@ in #tincAddress = "192.168.12.8/24"; (mkIf comp.isNomade{ - networking.hostName = "nomade.dubronetwork.fr"; # Define your hostname. + networking.hostName = "nomade"; # Define your hostname. + networking.domain = "dubronetwork.fr"; r6d.profiles.isDubronetwork = true; r6d.config-generator = { diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix index 04ff7f5..17e8d89 100644 --- a/configuration/auto-upgrade.nix +++ b/configuration/auto-upgrade.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/awesome.nix b/configuration/awesome.nix index ae5b73d..25a3742 100644 --- a/configuration/awesome.nix +++ b/configuration/awesome.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/default.nix b/configuration/default.nix index b521f55..7b38dd9 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/environment.nix b/configuration/environment.nix index 811d77a..aa6ba87 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/laptop.nix b/configuration/laptop.nix index 0ed3ace..019b8d2 100644 --- a/configuration/laptop.nix +++ b/configuration/laptop.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/localisation.nix b/configuration/localisation.nix index aa0c60a..4340285 100644 --- a/configuration/localisation.nix +++ b/configuration/localisation.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/network-ipv6.nix b/configuration/network-ipv6.nix index ab2d78a..cd988a3 100644 --- a/configuration/network-ipv6.nix +++ b/configuration/network-ipv6.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/network.nix b/configuration/network.nix index b6b181a..69042ba 100644 --- a/configuration/network.nix +++ b/configuration/network.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in @@ -13,7 +13,7 @@ mkIf true { # Il s'avère que hostname vérifie la validité du FQDN et du reverse. # Fixer ces paramètres dans les hosts permet de faire tomber en marche networking.extraHosts = '' - 127.0.0.1 ${config.networking.hostName} + 127.0.0.1 ${config.networking.fqdn} ${config.networking.hostName} ''; # Activation du routage diff --git a/configuration/swap.nix b/configuration/swap.nix index 602fdd5..0f44623 100644 --- a/configuration/swap.nix +++ b/configuration/swap.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/u2f.nix b/configuration/u2f.nix index a52b369..ac5c6e2 100644 --- a/configuration/u2f.nix +++ b/configuration/u2f.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/configuration/udev.nix b/configuration/udev.nix index bbdb94b..63adf9a 100644 --- a/configuration/udev.nix +++ b/configuration/udev.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/iso-image/configuration.nix b/iso-image/configuration.nix index b5bf770..f411956 100644 --- a/iso-image/configuration.nix +++ b/iso-image/configuration.nix @@ -19,5 +19,6 @@ } ]; environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";}; - networking.hostName = "nixos-livecd.corp.capgemini.com"; + networking.hostName = "nixos-livecd"; + networking.domain = "grudu.net"; } diff --git a/module-template.nix b/module-template.nix index 3cb37ef..6d9b71a 100644 --- a/module-template.nix +++ b/module-template.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/options.nix b/options.nix index 138e178..1bfe8ad 100644 --- a/options.nix +++ b/options.nix @@ -160,7 +160,7 @@ let }; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/dbus.nix b/services/dbus.nix index 78faab8..3419dfb 100644 --- a/services/dbus.nix +++ b/services/dbus.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/default.nix b/services/default.nix index 8f86e92..3b958a3 100644 --- a/services/default.nix +++ b/services/default.nix @@ -3,7 +3,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/docker.nix b/services/docker.nix index 95b96b4..87164e1 100644 --- a/services/docker.nix +++ b/services/docker.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/elasticsearch.nix b/services/elasticsearch.nix index f3f4974..3e2895c 100644 --- a/services/elasticsearch.nix +++ b/services/elasticsearch.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/gpm.nix b/services/gpm.nix index 6bbcb44..913dd22 100644 --- a/services/gpm.nix +++ b/services/gpm.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/haveged.nix b/services/haveged.nix index 35a272c..b419419 100644 --- a/services/haveged.nix +++ b/services/haveged.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/hoogle.nix b/services/hoogle.nix index cb8760f..139cb48 100644 --- a/services/hoogle.nix +++ b/services/hoogle.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/hydra-build.nix b/services/hydra-build.nix index 42aeb13..089a7ab 100644 --- a/services/hydra-build.nix +++ b/services/hydra-build.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in # TODO: ménage diff --git a/services/hydra-core.nix b/services/hydra-core.nix index 0688dfd..757c615 100644 --- a/services/hydra-core.nix +++ b/services/hydra-core.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; @@ -54,8 +54,8 @@ mkIf flags.hydra-core { services.hydra = { enable = true; - hydraURL = "http://hydra.${config.networking.hostName}"; - notificationSender = "hydra@${config.networking.hostName}"; + hydraURL = "http://hydra.${config.networking.fqdn}"; + notificationSender = "hydra@${config.networking.fqdn}"; listenHost = "localhost"; minimumDiskFree = 50; # Go smtpHost = "localhost"; diff --git a/services/kibana.nix b/services/kibana.nix index b002ef3..afaf86e 100644 --- a/services/kibana.nix +++ b/services/kibana.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/locate.nix b/services/locate.nix index adac879..c8dde77 100644 --- a/services/locate.nix +++ b/services/locate.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix index 6591a85..a4948ca 100644 --- a/services/monitoring-munin.nix +++ b/services/monitoring-munin.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in @@ -54,7 +54,7 @@ mkIf flags.munin { services.munin-cron = { enable = true; hosts = '' - [${config.networking.hostName}] + [${config.networking.fqdn}] address 127.0.0.1 df._dev_sda2.warning 35 use_node_name yes @@ -65,9 +65,9 @@ mkIf flags.munin { # http://guide.munin-monitoring.org/en/latest/tutorial/alert.html#syntax-of-warning-and-critical extraGlobalConfig = '' #--- - #contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr - contact.email.command /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr - contact.syslog.command /run/current-system/sw/bin/logger -p user.crit -t "Munin notification for ${config.networking.hostName}" + #contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.fqdn}" root@ocean.prunetwork.fr + contact.email.command /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc -s "Munin notification for ${config.networking.fqdn}" root@ocean.prunetwork.fr + contact.syslog.command /run/current-system/sw/bin/logger -p user.crit -t "Munin notification for ${config.networking.fqdn}" #--- contact.email.always_send ok,warning,critical,unknown diff --git a/services/nixos-manual.nix b/services/nixos-manual.nix index fc2c9a3..a49ff97 100644 --- a/services/nixos-manual.nix +++ b/services/nixos-manual.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/print.nix b/services/print.nix index 1362bac..3a21096 100644 --- a/services/print.nix +++ b/services/print.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix index a770dd7..bee41d4 100644 --- a/services/pulseaudio.nix +++ b/services/pulseaudio.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/scanner.nix b/services/scanner.nix index e320186..86da935 100644 --- a/services/scanner.nix +++ b/services/scanner.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/ssh.nix b/services/ssh.nix index 1030bfd..2abc847 100644 --- a/services/ssh.nix +++ b/services/ssh.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/virtualbox.nix b/services/virtualbox.nix index 8d5e874..d61937e 100644 --- a/services/virtualbox.nix +++ b/services/virtualbox.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/x11.nix b/services/x11.nix index acf108d..f91f8e6 100644 --- a/services/x11.nix +++ b/services/x11.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index 2f1768c..46734db 100644 --- a/services/xmonad/xmonad.nix +++ b/services/xmonad/xmonad.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in diff --git a/services/yubikey.nix b/services/yubikey.nix index 3ca6d30..3aefd53 100644 --- a/services/yubikey.nix +++ b/services/yubikey.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; - currentMachine = annuaire."${config.networking.hostName}"; + currentMachine = annuaire."${config.networking.fqdn}"; flags = currentMachine.configurationFlags; in