From 75ff0e4937db594865379aa64f856fa7813d5cd5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 21 Aug 2016 11:53:07 +0200
Subject: m 3 deluge: implement auth

---
 makefu/3modules/deluge.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/deluge.nix b/makefu/3modules/deluge.nix
index 8097885b..e81f96f8 100644
--- a/makefu/3modules/deluge.nix
+++ b/makefu/3modules/deluge.nix
@@ -5,12 +5,13 @@ with config.krebs.lib;
 let
   cfg_daemon = config.makefu.deluge;
   homedir = cfg_daemon.homedir;
+  delugedir = "${homedir}/.config/deluge";
   cfg_web = config.makefu.deluge.web;
   core_conf = pkgs.writeText "deluge-core-cfg" ''
     {
       "file": 1,
       "format": 1
-    }${builtins.toJSON (recursiveUpdate default_core_cfg cfg_daemon.cfg)}
+    }${builtins.toJSON (default_core_cfg // cfg_daemon.cfg)}
   '';
 
   default_core_cfg = {
@@ -145,9 +146,11 @@ let
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
-        ExecStartPre = pkgs.writeDash "deluged-init" ''
-          mkdir -p ${homedir}/.config/deluge
-          cp ${core_conf} ${homedir}/.config/deluge/core.conf
+        ExecStartPre =  let
+        in  pkgs.writeDash "deluged-init" ''
+          mkdir -p ${delugedir}
+          echo ${shell.escape cfg_daemon.auth} > ${delugedir}/auth
+          cp -f ${core_conf} ${delugedir}/core.conf
         '';
         Restart = "on-success";
         User = "deluge";
-- 
cgit v1.2.3