From 68a968ac1b1a077494efb56e18c83e79fe0bae7f Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 22 Jun 2015 20:11:02 +0200
Subject: tv retiolum: split module into options and config

---
 modules/mkdir/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'modules/mkdir')

diff --git a/modules/mkdir/default.nix b/modules/mkdir/default.nix
index 9dc426dfe..964a3c4b2 100644
--- a/modules/mkdir/default.nix
+++ b/modules/mkdir/default.nix
@@ -15,7 +15,6 @@ in
       ../tv/base-cac-CentOS-7-64bit.nix
       ../tv/exim-smarthost.nix
       ../tv/git/public.nix
-      ../tv/retiolum.nix
       ../tv/sanitize.nix
       {
         imports = [ ../tv/iptables ];
@@ -33,6 +32,19 @@ in
           ];
         };
       }
+      {
+        imports = [ ../tv/retiolum ];
+        tv.retiolum = {
+          enable = true;
+          hosts = <retiolum-hosts>;
+          connectTo = [
+            "cd"
+            "fastpoke"
+            "pigstarter"
+            "ire"
+          ];
+        };
+      }
     ];
 
   nix.maxJobs = 1;
@@ -74,17 +86,5 @@ in
     permitRootLogin = "yes";
   };
 
-  services.retiolum = {
-    enable = true;
-    hosts = <retiolum-hosts>;
-    privateKeyFile = "/etc/tinc/retiolum/rsa_key.priv";
-    connectTo = [
-      "cd"
-      "fastpoke"
-      "pigstarter"
-      "ire"
-    ];
-  };
-
   sound.enable = false;
 }
-- 
cgit v1.2.3