diff options
| author | lassulus <lass@aidsballs.de> | 2015-08-13 22:36:07 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-08-13 22:36:07 +0200 |
| commit | cc1baf4d385e45b8c9f0509c04e8883f48ade6ae (patch) | |
| tree | 9eb6a04cdb91414d662409e7f8b3b2e396f92895 /tv/1systems | |
| parent | dbd69c4e956bc1c88b379c273a5ea5b4ceea8813 (diff) | |
| parent | db4b55527d527158bd4e7f93128668e646f2cf1f (diff) | |
Merge branch 'tv' into newmaster
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/nomic.nix | 4 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index b9a10cb4f..896c1ad29 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -25,7 +25,6 @@ with lib; ../2configs/AO753.nix ../2configs/base.nix ../2configs/consul-server.nix - ../2configs/exim-retiolum.nix ../2configs/git.nix { tv.iptables = { @@ -39,6 +38,9 @@ with lib; }; } { + krebs.exim-retiolum = true; + } + { krebs.nginx = { enable = true; servers.default.locations = [ diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 27691ec56..a5cbde3ec 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -29,7 +29,6 @@ in ../2configs/w110er.nix ../2configs/base.nix ../2configs/consul-client.nix - ../2configs/exim-retiolum.nix ../2configs/git.nix ../2configs/mail-client.nix ../2configs/xserver.nix @@ -91,6 +90,7 @@ in sxiv texLive tmux + tvpkgs.cac tvpkgs.dic zathura @@ -165,6 +165,9 @@ in }; } { + krebs.exim-retiolum = true; + } + { krebs.nginx = { enable = true; servers.default.locations = [ |