diff options
| author | lassulus <lass@aidsballs.de> | 2016-08-21 13:16:56 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-08-21 13:16:56 +0200 |
| commit | d50198d880c4be21413f9bb536b784005204beb9 (patch) | |
| tree | 28ea56d3694e7239e532474f677a95f6604c00c5 /makefu/1systems/x.nix | |
| parent | 3eb5f58a0ee9778006d4e37fee17e0b3e096a52a (diff) | |
| parent | d1c4d12cee228cba1da4da7bba82b6cf6cb708ec (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/x.nix')
| -rw-r--r-- | makefu/1systems/x.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index d41edfa46..4829aaabd 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -32,6 +32,7 @@ # hardware specifics are in here ../2configs/hw/tp-x220.nix ../2configs/hw/rtl8812au.nix + ../2configs/hw/bcm4352.nix # mount points ../2configs/fs/sda-crypto-root-home.nix # ../2configs/mediawiki.nix @@ -41,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" ]; @@ -57,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; |