diff options
author | tv <tv@shackspace.de> | 2015-07-24 17:34:08 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-07-24 17:34:08 +0200 |
commit | f1ebbc73395e733e222b7f51e3fb554579ec1916 (patch) | |
tree | b3fa8c5d6279248391f5cd72f92e9bece13e4470 /3modules | |
parent | faf5f6c172d6a6915e18cdec85e3543051eb0449 (diff) |
autoimport 3*/{krebs,$(LOGNAME)}
Diffstat (limited to '3modules')
-rw-r--r-- | 3modules/krebs/default.nix | 11 | ||||
-rw-r--r-- | 3modules/tv/consul.nix | 1 | ||||
-rw-r--r-- | 3modules/tv/default.nix | 10 |
3 files changed, 21 insertions, 1 deletions
diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix new file mode 100644 index 000000000..fe94e09b3 --- /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 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 + ]; +} |