From 4165440f467e2c573ba248ae9cdcae54d1488bc5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 17:34:08 +0200
Subject: autoimport 3*/{krebs,$(LOGNAME)}

---
 3modules/krebs/default.nix | 11 +++++++++++
 3modules/tv/consul.nix     |  1 -
 3modules/tv/default.nix    | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 3modules/krebs/default.nix
 create mode 100644 3modules/tv/default.nix

(limited to '3modules')

diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix
new file mode 100644
index 0000000..fe94e09
--- /dev/null
+++ b/3modules/krebs/default.nix
@@ -0,0 +1,11 @@
+_:
+
+{
+  imports = [
+    ./github-hosts-sync.nix
+    ./git.nix
+    ./nginx.nix
+    ./retiolum.nix
+    ./urlwatch.nix
+  ];
+}
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
+  ];
+}
-- 
cgit v1.2.3