diff options
| author | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
| commit | d81b068113325fb7604089c3647c365a41804978 (patch) | |
| tree | 4c43ad2142825ac7c0a7045e5c48a039b25f6786 /makefu/1systems/pornocauster.nix | |
| parent | 1542f9bbee823025f703e6abf3836905cee416fd (diff) | |
| parent | f12578c66f8b7b829c0dec5255f358778c0d3366 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/pornocauster.nix')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index fa39b121c..7b6c18342 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -31,6 +31,7 @@ # hardware specifics are in here ../2configs/hw/tp-x220.nix + ../2configs/hw/rtl8812au.nix # mount points ../2configs/fs/sda-crypto-root-home.nix # ../2configs/mediawiki.nix @@ -43,6 +44,14 @@ # ../2configs/temp/sabnzbd.nix ]; + services.tinc.networks.siem = { + name = "makefu"; + extraConfig = '' + ConnectTo = sdarth + ConnectTo = sjump + ''; + }; + krebs.nginx = { default404 = false; servers.default.listen = [ "80 default_server" ]; @@ -59,7 +68,6 @@ networking.firewall.allowedUDPPorts = [ 665 ]; krebs.build.host = config.krebs.hosts.pornocauster; - krebs.hosts.omo.nets.retiolum.via.ip4.addr = "192.168.1.11"; krebs.retiolum = { enable = true; @@ -68,4 +76,6 @@ networking.extraHosts = '' 192.168.1.11 omo.local ''; + # hard dependency because otherwise the device will not be unlocked + boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; } |