tv retiolum: split module into options and config

1 files changed, 12 insertions, 12 deletions

diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 21d9565f8..016f88324 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -16,7 +16,6 @@ in
       ../tv/ejabberd.nix # XXX echtes modul
       ../tv/exim-smarthost.nix
       ../tv/git/public.nix
-      ../tv/retiolum.nix
       ../tv/sanitize.nix
       {
         imports = [ ../tv/iptables ];
@@ -34,6 +33,18 @@ in
           ];
         };
       }
+      {
+        imports = [ ../tv/retiolum ];
+        tv.retiolum = {
+          enable = true;
+          hosts = <retiolum-hosts>;
+          connectTo = [
+            "fastpoke"
+            "pigstarter"
+            "ire"
+          ];
+        };
+      }
     ];
 
   # "Developer 2" plan has two vCPUs.
@@ -80,16 +91,5 @@ in
     permitRootLogin = "yes";
   };
 
-  services.retiolum = {
-    enable = true;
-    hosts = <retiolum-hosts>;
-    privateKeyFile = "/etc/tinc/retiolum/rsa_key.priv";
-    connectTo = [
-      "fastpoke"
-      "pigstarter"
-      "ire"
-    ];
-  };
-
   sound.enable = false;
 }