diff options
| author | tv <tv@krebsco.de> | 2016-10-13 20:33:45 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-13 20:33:45 +0200 |
| commit | 65165f422d8e08f29ec269a3ce98e7ebfa22c622 (patch) | |
| tree | 13d15f63626129c439840a4b406e3fe4e693096f /makefu/1systems/x.nix | |
| parent | 38d26c551cf3c53151120646a893a13990b21c5c (diff) | |
| parent | 8458ffd7a00a3e4c734755de7d72f95458d1bb52 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/x.nix')
| -rw-r--r-- | makefu/1systems/x.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index 4829aaabd..0243856ab 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -9,6 +9,7 @@ ../. ../2configs/main-laptop.nix #< base-gui + zsh ../2configs/laptop-utils.nix + ../2configs/laptop-backup.nix # Krebs #../2configs/disable_v6.nix @@ -42,13 +43,14 @@ ../2configs/tinc/retiolum.nix # temporary modules ../2configs/temp/share-samba.nix - ../2configs/temp/elkstack.nix + ../2configs/laptop-backup.nix + # ../2configs/temp/elkstack.nix # ../2configs/temp/sabnzbd.nix ../2configs/tinc/siem.nix - ../2configs/torrent.nix + #../2configs/torrent.nix ]; makefu.full-populate = true; - makefu.deluge.web.enable = true; + krebs.nginx = { default404 = false; servers.default.listen = [ "80 default_server" ]; |