summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-11 17:54:00 +0200
committerlassulus <lass@aidsballs.de>2016-10-11 17:54:00 +0200
commit798f90c0fd8931ef114f7c7db32daa9f15824733 (patch)
treee241892be8c85d05d297f11a5d312d41e2cb8f66 /makefu/1systems
parentb6c5994e037ab92055f5cfdeb89f46864b348b39 (diff)
parentfa5816431ce0314b1c3260c763a87922b0ad485b (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/gum.nix2
-rw-r--r--makefu/1systems/omo.nix15
-rw-r--r--makefu/1systems/x.nix8
3 files changed, 15 insertions, 10 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index ab369d192..401ec6093 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -22,6 +22,8 @@ in {
../2configs/tinc/retiolum.nix
../2configs/urlwatch.nix
../2configs/torrent.nix
+ ../2configs/sabnzbd.nix
+
../2configs/opentracker.nix
];
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 96f7be9fc..71fb85ff6 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -43,9 +43,11 @@ in {
# TODO: unlock home partition via ssh
../2configs/fs/sda-crypto-root.nix
../2configs/zsh-user.nix
+ ../2configs/urlwatch.nix
../2configs/exim-retiolum.nix
../2configs/smart-monitor.nix
../2configs/mail-client.nix
+ ../2configs/disable_v6.nix
#../2configs/graphite-standalone.nix
#../2configs/share-user-sftp.nix
../2configs/omo-share.nix
@@ -56,13 +58,11 @@ in {
# docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
];
makefu.full-populate = true;
- makefu.deluge.cfg = {
- max_active_seeding = 1;
- stop_seed_ratio = 1;
- natpmp = true;
- upnp = true;
- max_upload_speed = 200;
-
+ krebs.rtorrent = {
+ downloadDir = lib.mkForce "/media/crypt0/torrent";
+ extraConfig = ''
+ upload_rate = 200
+ '';
};
users.groups.share = {
gid = config.krebs.lib.genid "share";
@@ -109,6 +109,7 @@ in {
environment.systemPackages = with pkgs;[
mergerfs # hard requirement for mount
wol # wake up filepimp
+ f3
];
fileSystems = let
cryptMount = name:
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" ];