diff options
| author | makefu <github@syntax-fehler.de> | 2015-07-24 21:04:22 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-07-24 21:04:22 +0200 |
| commit | e1f4ef731f34056c8360de8be21c2bfbc396d2e4 (patch) | |
| tree | a960212d1ee8b0666ebb934c383816900d45cc7a /1systems/tv/mkdir.nix | |
| parent | 7d71db1eb0ce36f8be914f53412615eba0090747 (diff) | |
| parent | a62be1cef8726a2afa61df3dac9e19a71882b370 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to '1systems/tv/mkdir.nix')
| -rw-r--r-- | 1systems/tv/mkdir.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix index e0e057d63..3e5fb7286 100644 --- a/1systems/tv/mkdir.nix +++ b/1systems/tv/mkdir.nix @@ -9,13 +9,12 @@ with lib; ../../2configs/tv/base.nix ../../2configs/tv/consul-server.nix ../../2configs/tv/exim-smarthost.nix - ../../2configs/tv/git-public.nix + ../../2configs/tv/git.nix { imports = [ ../../2configs/tv/identity.nix ]; tv.identity.self = config.tv.identity.hosts.mkdir; } { - imports = [ ../../3modules/tv/iptables.nix ]; tv.iptables = { enable = true; input-internet-accept-new-tcp = [ @@ -29,10 +28,8 @@ with lib; }; } { - imports = [ ../../3modules/tv/retiolum.nix ]; - tv.retiolum = { + krebs.retiolum = { enable = true; - hosts = ../../Zhosts; connectTo = [ "cd" "fastpoke" |