nixos-config/nixos-template-base
4
0
Fork 0
Code Issues 7 Pull Requests Releases Activity

utilisation de networking.fqdn (hostName + domain)

Browse Source 
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.
This commit is contained in:
Yves Dubromelle
2021-05-06 23:50:07 +02:00
parent 9ed945bba8
commit 4a5f0ba1a7
82 changed files with 93 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -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 :

2
applications/graphical/adminsys.nix
View File

@@ -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

2
applications/graphical/bureau.nix
View File

@@ -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

2
applications/graphical/bureautique.nix
View File

@@ -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

2
applications/graphical/cao.nix
View File

@@ -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

2
applications/graphical/cartographie.nix
View File

@@ -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

2
applications/graphical/client-internet.nix
View File

@@ -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

2
applications/graphical/default-applications.nix
View File

@@ -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

2
applications/graphical/default.nix
View File

@@ -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

2
applications/graphical/developpement-elm.nix
View File

@@ -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

2
applications/graphical/developpement-haskell.nix
View File

@@ -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

2
applications/graphical/developpement-java.nix
View File

@@ -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

2
applications/graphical/developpement-jetbrains.nix
View File

@@ -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

2
applications/graphical/developpement-rust.nix
View File

@@ -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

2
applications/graphical/developpement.nix
View File

@@ -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

2
applications/graphical/edition-musique.nix
View File

@@ -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

2
applications/graphical/edition-photo.nix
View File

@@ -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

2
applications/graphical/edition-video.nix
View File

@@ -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

2
applications/graphical/jeux.nix
View File

@@ -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

2
applications/graphical/multimedia.nix
View File

@@ -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

2
applications/graphical/network.nix
View File

@@ -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

2
applications/graphical/radio.nix
View File

@@ -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

2
applications/graphical/securite.nix
View File

@@ -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

2
applications/overrides.nix
View File

@@ -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

2
applications/terminal/adminsys.nix
View File

@@ -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

2
applications/terminal/bureau.nix
View File

@@ -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

2
applications/terminal/bureautique.nix
View File

@@ -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

2
applications/terminal/cao.nix
View File

@@ -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

2
applications/terminal/cartographie.nix
View File

@@ -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

2
applications/terminal/client-internet.nix
View File

@@ -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

2
applications/terminal/default-applications.nix
View File

@@ -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

2
applications/terminal/default.nix
View File

@@ -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

2
applications/terminal/developpement-elm.nix
View File

@@ -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

2
applications/terminal/developpement-haskell.nix
View File

@@ -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

2
applications/terminal/developpement-java.nix
View File

@@ -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

2
applications/terminal/developpement-jetbrains.nix
View File

@@ -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

2
applications/terminal/developpement-rust.nix
View File

@@ -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

2
applications/terminal/developpement.nix
View File

@@ -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

2
applications/terminal/edition-musique.nix
View File

@@ -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

2
applications/terminal/edition-photo.nix
View File

@@ -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

2
applications/terminal/edition-video.nix
View File

@@ -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

2
applications/terminal/jeux.nix
View File

@@ -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

2
applications/terminal/multimedia.nix
View File

@@ -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

2
applications/terminal/network.nix
View File

@@ -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

2
applications/terminal/radio.nix
View File

@@ -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

2
applications/terminal/securite.nix
View File

@@ -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

7
config-generator.nix
View File

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

2
configuration/auto-upgrade.nix
View File

@@ -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

2
configuration/awesome.nix
View File

@@ -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

2
configuration/default.nix
View File

@@ -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

2
configuration/environment.nix
View File

@@ -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

2
configuration/laptop.nix
View File

@@ -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

2
configuration/localisation.nix
View File

@@ -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

2
configuration/network-ipv6.nix
View File

@@ -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

4
configuration/network.nix
View File

@@ -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

2
configuration/swap.nix
View File

@@ -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

2
configuration/u2f.nix
View File

@@ -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

2
configuration/udev.nix
View File

@@ -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

3
iso-image/configuration.nix
View File

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

2
module-template.nix
View File

@@ -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

2
options.nix
View File

@@ -160,7 +160,7 @@ let
};
annuaire = config.r6d.machines;
currentMachine = annuaire."${config.networking.hostName}";
currentMachine = annuaire."${config.networking.fqdn}";
flags = currentMachine.configurationFlags;
in

2
services/dbus.nix
View File

@@ -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

2
services/default.nix
View File

@@ -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

2
services/docker.nix
View File

@@ -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

2
services/elasticsearch.nix
View File

@@ -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

2
services/gpm.nix
View File

@@ -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

2
services/haveged.nix
View File

@@ -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

2
services/hoogle.nix
View File

@@ -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

2
services/hydra-build.nix
View File

@@ -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

6
services/hydra-core.nix
View File

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

2
services/kibana.nix
View File

@@ -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

2
services/locate.nix
View File

@@ -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

10
services/monitoring-munin.nix
View File

@@ -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

2
services/nixos-manual.nix
View File

@@ -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

2
services/print.nix
View File

@@ -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

2
services/pulseaudio.nix
View File

@@ -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

2
services/scanner.nix
View File

@@ -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

2
services/ssh.nix
View File

@@ -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

2
services/virtualbox.nix
View File

@@ -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

2
services/x11.nix
View File

@@ -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

2
services/xmonad/xmonad.nix
View File

@@ -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

2
services/yubikey.nix
View File

@@ -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