annuaire: ajout variables dans template & application

2017-04-24 23:22:11 +02:00
parent fe6f3136f7
commit ddac52530b
71 changed files with 143 additions and 1 deletions
--- a/services/default.nix
+++ b/services/default.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 {
--- a/services/docker.nix
+++ b/services/docker.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.docker {
--- a/services/elasticsearch.nix
+++ b/services/elasticsearch.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.elasticsearch {
--- a/services/haveged.nix
+++ b/services/haveged.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf true {
--- a/services/hoogle.nix
+++ b/services/hoogle.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.developpement-haskell {
--- a/services/hydra-build.nix
+++ b/services/hydra-build.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 # TODO: ménage
 mkIf cfg.hydra-builder {
--- a/services/hydra-core.nix
+++ b/services/hydra-core.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";


  #### https://github.com/NixOS/hydra/issues/413
--- a/services/kibana.nix
+++ b/services/kibana.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.kibana {
--- a/services/locate.nix
+++ b/services/locate.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.locate {
--- a/services/monitoring-munin.nix
+++ b/services/monitoring-munin.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 # TODO: ajouter option
--- a/services/print.nix
+++ b/services/print.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.print {
--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.pulseaudio {
--- a/services/scanner.nix
+++ b/services/scanner.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.scanner {
--- a/services/ssh.nix
+++ b/services/ssh.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf true {
--- a/services/virtualbox.nix
+++ b/services/virtualbox.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.virtualbox {
--- a/services/x11.nix
+++ b/services/x11.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf profiles.isDesktopEnvironment {
--- a/services/xmonad/xmonad.nix
+++ b/services/xmonad/xmonad.nix
@@ -5,6 +5,8 @@ let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in

 mkIf cfg.xmonad {