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 | 6b2a9d6b26ef75ee78c96839d4aa06ab027fcf4e (patch) | |
| tree | edae5b9996be874d0795571af2f1356e4b904a2b /1systems/tv/rmdir.nix | |
| parent | 8cf043ca2014e566ce2dc056d392fe9f85dc7cb7 (diff) | |
| parent | 2154167857b6bd35c8b1cce2ad41521164abb2ff (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to '1systems/tv/rmdir.nix')
| -rw-r--r-- | 1systems/tv/rmdir.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index b77a1c3..c470086 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.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.rmdir; } { - 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" "mkdir" |