Merge remote-tracking branch 'cd/master'

3 files changed, 10 insertions, 30 deletions

diff --git a/3modules/tv/consul.nix b/3modules/tv/consul.nix
index 312faa0..4e54c2a 100644
--- a/3modules/tv/consul.nix
+++ b/3modules/tv/consul.nix
@@ -10,7 +10,6 @@ let
   cfg = config.tv.consul;
 
   out = {
-    imports = [ ../../3modules/tv/iptables.nix ];
     options.tv.consul = api;
     config = mkIf cfg.enable (mkMerge [
       imp
diff --git a/3modules/tv/default.nix b/3modules/tv/default.nix
new file mode 100644
index 0000000..e267d0b
--- /dev/null
+++ b/3modules/tv/default.nix
@@ -0,0 +1,10 @@
+_:
+
+{
+  imports = [
+    ./consul.nix
+    ./ejabberd.nix
+    ./identity.nix
+    ./iptables.nix
+  ];
+}
diff --git a/3modules/tv/retiolum.nix b/3modules/tv/retiolum.nix
deleted file mode 100644
index d003774..0000000
--- a/3modules/tv/retiolum.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  cfg = config.tv.retiolum;
-
-  out = {
-    imports = [ ../../3modules/krebs/retiolum.nix ];
-    options.tv.retiolum = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = {
-    enable = mkEnableOption "tv.retiolum";
-
-    connectTo = mkOption {
-      type = with types; listOf str;
-    };
-
-    hosts = mkOption {
-      type = types.path;
-    };
-  };
-
-  imp = {
-    krebs.retiolum = cfg;
-  };
-
-in out