diff options
| author | lassulus <lass@aidsballs.de> | 2016-04-27 12:47:13 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-04-27 12:47:13 +0200 |
| commit | 94fa4005d601ed07be8e23f2c9126573a07bf270 (patch) | |
| tree | 47a67f455cabddfc14f1dc27a8393e2f4750ca3c /tv | |
| parent | 64f493ccbf31f824d0c60821546644d6e0b3d842 (diff) | |
| parent | 1241c61b8867b46a572605a69dd9b1fead65aa2b (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/1systems/wu.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/exim-retiolum.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/exim-smarthost.nix | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 27dd12520..cebd7c9e4 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -183,7 +183,5 @@ with config.krebs.lib; KERNEL=="hpet", GROUP="audio" ''; - services.tor.client.enable = true; - services.tor.enable = true; services.virtualboxHost.enable = true; } diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix index dbe83dcf1..9197a3c30 100644 --- a/tv/2configs/exim-retiolum.nix +++ b/tv/2configs/exim-retiolum.nix @@ -4,9 +4,5 @@ with config.krebs.lib; { krebs.exim-retiolum.enable = true; - krebs.setuid.sendmail = { - filename = "${pkgs.exim}/bin/exim"; - mode = "4111"; - }; tv.iptables.input-retiolum-accept-new-tcp = singleton "smtp"; } diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index 2b9ad77d7..3616a8f52 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -43,9 +43,5 @@ with config.krebs.lib; { from = "mirko"; to = "mv"; } ]; }; - krebs.setuid.sendmail = { - filename = "${pkgs.exim}/bin/exim"; - mode = "4111"; - }; tv.iptables.input-internet-accept-new-tcp = singleton "smtp"; } |