diff options
| author | makefu <github@syntax-fehler.de> | 2016-08-21 12:06:31 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-08-21 12:06:31 +0200 |
| commit | 9c1cd09a8171ffd85a77a7e89a020cabcab2b4f4 (patch) | |
| tree | bfe3664ae06b2fb9f9dfe577a8edb7ffe2137665 /makefu | |
| parent | 90afbfa31af036f4475005cd80dbf6b1722c4de4 (diff) | |
m 1 *: add torrent
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/gum.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/shoney.nix | 1 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 5 | ||||
| -rw-r--r-- | makefu/1systems/x.nix | 7 |
4 files changed, 10 insertions, 5 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index a4e2d176..0d8ac005 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -21,9 +21,9 @@ in { ../2configs/exim-retiolum.nix ../2configs/tinc/retiolum.nix ../2configs/urlwatch.nix + ../2configs/torrent.nix ]; - services.smartd.devices = [ { device = "/dev/sda";} ]; ###### stable diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix index 7081f6a9..1c5d2352 100644 --- a/makefu/1systems/shoney.nix +++ b/makefu/1systems/shoney.nix @@ -14,6 +14,7 @@ in { ../2configs/hw/CAC.nix ../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/tinc/retiolum.nix + ../2configs/torrent.nix ]; diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 3764ab4b..81cd362e 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -24,9 +24,10 @@ in { ../2configs/nginx/euer.test.nix # collectd - ../2configs/collectd/collectd-base.nix + # ../2configs/collectd/collectd-base.nix ../2configs/tinc/retiolum.nix + ../2configs/torrent.nix ]; krebs.build.host = config.krebs.hosts.wry; @@ -83,5 +84,5 @@ in { nameservers = [ "8.8.8.8" ]; }; - environment.systemPackages = [ ]; + environment.systemPackages = [ pkgs.screen ]; } diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index 2d6923c9..4829aaab 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -42,10 +42,13 @@ ../2configs/tinc/retiolum.nix # temporary modules ../2configs/temp/share-samba.nix - # ../2configs/temp/elkstack.nix + ../2configs/temp/elkstack.nix # ../2configs/temp/sabnzbd.nix ../2configs/tinc/siem.nix + ../2configs/torrent.nix ]; + makefu.full-populate = true; + makefu.deluge.web.enable = true; krebs.nginx = { default404 = false; servers.default.listen = [ "80 default_server" ]; @@ -58,7 +61,7 @@ # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ 80 24800 26061 ]; + networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 ]; networking.firewall.allowedUDPPorts = [ 665 26061 ]; krebs.build.host = config.krebs.hosts.x; |