Merge remote-tracking branch 'gum/master'

3 files changed, 26 insertions, 0 deletions

diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix
index 16215b27a..546fed109 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -8,9 +8,11 @@ _:
     ./forward-journal.nix
     ./opentracker.nix
     ./ps3netsrv.nix
+    ./logging-config.nix
     ./server-config.nix
     ./snapraid.nix
     ./taskserver.nix
+    ./torrent.nix
     ./udpt.nix
     ./umts.nix
   ];
diff --git a/makefu/3modules/logging-config.nix b/makefu/3modules/logging-config.nix
new file mode 100644
index 000000000..cd6924f61
--- /dev/null
+++ b/makefu/3modules/logging-config.nix
@@ -0,0 +1,11 @@
+{config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+{
+  options.makefu.stats-server = lib.mkOption {
+    type = types.str;
+    default = "omo.retiolum";
+    description = "Central stats server (collectd)";
+  };
+}
+
diff --git a/makefu/3modules/torrent.nix b/makefu/3modules/torrent.nix
new file mode 100644
index 000000000..9f1cf3398
--- /dev/null
+++ b/makefu/3modules/torrent.nix
@@ -0,0 +1,13 @@
+{config, lib, pkgs, ... }:
+
+{
+  options.makefu.dl-dir = lib.mkOption {
+    type = lib.types.str;
+    description = "Default download directory";
+    default = "/media/cryptX/torrent";
+  };
+  options.makefu.torrent-secrets = lib.mkOption {
+    type = lib.types.str;
+    default = "/home/makefu/secrets/torrent";
+  };
+}