utilisation de networking.fqdn (hostName + domain)

Les nouvelles règles dans NixOS obligent à avoir dans networking.hostName
un label DNS strict, il faut donc préciser le domaine à part dans
networking.domain.
networking.fqdn est une facilité pour concaténer les deux, en lecture
seule.

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 = "<X>";`
+* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "<X>";`
 * tester la configuration : `nixos-rebuild build`
 * corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` )
 * lorsque tout semble bon, vérifier :

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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 = {

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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";
 }

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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}";
+    hydraURL = "http://hydra.${config.networking.fqdn}";
-    notificationSender = "hydra@${config.networking.hostName}";
+    notificationSender = "hydra@${config.networking.fqdn}";
     listenHost = "localhost";
     minimumDiskFree = 50; # Go
     smtpHost = "localhost";

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
 

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
 

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 ${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.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.fqdn}" root@ocean.prunetwork.fr
-      contact.syslog.command /run/current-system/sw/bin/logger -p user.crit                 -t "Munin notification for ${config.networking.hostName}"
+      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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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