summaryrefslogtreecommitdiffstats
path: root/3modules/tv
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-24 17:34:08 +0200
committertv <tv@shackspace.de>2015-07-24 17:34:08 +0200
commitf1ebbc73395e733e222b7f51e3fb554579ec1916 (patch)
treeb3fa8c5d6279248391f5cd72f92e9bece13e4470 /3modules/tv
parentfaf5f6c172d6a6915e18cdec85e3543051eb0449 (diff)
autoimport 3*/{krebs,$(LOGNAME)}
Diffstat (limited to '3modules/tv')
-rw-r--r--3modules/tv/consul.nix1
-rw-r--r--3modules/tv/default.nix10
2 files changed, 10 insertions, 1 deletions
diff --git a/3modules/tv/consul.nix b/3modules/tv/consul.nix
index 312faa02f..4e54c2ab0 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 000000000..e267d0b9f
--- /dev/null
+++ b/3modules/tv/default.nix
@@ -0,0 +1,10 @@
+_:
+
+{
+ imports = [
+ ./consul.nix
+ ./ejabberd.nix
+ ./identity.nix
+ ./iptables.nix
+ ];
+}