From 6cbe21aac7680af7a6c6c2ea367ee0569d53bb21 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 Feb 2016 23:16:08 +0100
Subject: krebs.retiolum: make hostsPackage configurable

---
 krebs/3modules/retiolum.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 2bf8aa5d..3ebb5e23 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -64,6 +64,21 @@ let
       '';
     };
 
+    hostsPackage = mkOption {
+      type = types.package;
+      default = pkgs.stdenv.mkDerivation {
+        name = "${cfg.netname}-tinc-hosts";
+        phases = [ "installPhase" ];
+        installPhase = ''
+          mkdir $out
+          ${concatStrings (mapAttrsToList (_: host: ''
+            echo ${shell.escape host.nets.${cfg.netname}.tinc.config} \
+              > $out/${shell.escape host.name}
+          '') cfg.hosts)}
+        '';
+      };
+    };
+
     iproutePackage = mkOption {
       type = types.package;
       default = pkgs.iproute;
@@ -130,18 +145,6 @@ let
 
   tinc = cfg.tincPackage;
 
-  tinc-hosts = pkgs.stdenv.mkDerivation {
-    name = "${cfg.netname}-tinc-hosts";
-    phases = [ "installPhase" ];
-    installPhase = ''
-      mkdir $out
-      ${concatStrings (mapAttrsToList (_: host: ''
-        echo ${shell.escape host.nets.${cfg.netname}.tinc.config} \
-          > $out/${shell.escape host.name}
-      '') cfg.hosts)}
-    '';
-  };
-
   iproute = cfg.iproutePackage;
 
   confDir = pkgs.runCommand "retiolum" {
@@ -153,7 +156,7 @@ let
 
     mkdir -p $out
 
-    ln -s ${tinc-hosts} $out/hosts
+    ln -s ${cfg.hostsPackage} $out/hosts
 
     cat > $out/tinc.conf <<EOF
     Name = ${cfg.name}
-- 
cgit v1.2.3