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/nomic.nix | |
| parent | 7d71db1eb0ce36f8be914f53412615eba0090747 (diff) | |
| parent | a62be1cef8726a2afa61df3dac9e19a71882b370 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to '1systems/tv/nomic.nix')
| -rw-r--r-- | 1systems/tv/nomic.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index 8e6812e43..2d32d9e1f 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -8,13 +8,12 @@ with lib; ../../2configs/tv/base.nix ../../2configs/tv/consul-server.nix ../../2configs/tv/exim-retiolum.nix - ../../2configs/tv/git-public.nix + ../../2configs/tv/git.nix { imports = [ ../../2configs/tv/identity.nix ]; tv.identity.self = config.tv.identity.hosts.nomic; } { - imports = [ ../../3modules/tv/iptables.nix ]; tv.iptables = { enable = true; input-internet-accept-new-tcp = [ @@ -26,7 +25,6 @@ with lib; }; } { - imports = [ ../../3modules/krebs/nginx.nix ]; krebs.nginx = { enable = true; servers.default.locations = [ @@ -37,10 +35,8 @@ with lib; }; } { - imports = [ ../../3modules/tv/retiolum.nix ]; - tv.retiolum = { + krebs.retiolum = { enable = true; - hosts = ../../Zhosts; connectTo = [ "gum" "pigstarter" |