From 48eacd11b5cf9fd417bb68ee5e442c7cd3ffa6ac Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 2 Jul 2020 08:28:45 +0200
Subject: rtorrent module: not use extraConfig

---
 krebs/3modules/rtorrent.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'krebs/3modules/rtorrent.nix')

diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index eb27aa34..e5566f32 100644
--- a/krebs/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -328,6 +328,8 @@ let
       pools.rutorrent = {
         user =  nginx-user;
         group =  nginx-group;
+        phpEnv.PATH = makeBinPath rutorrent-deps;
+
         settings = {
           "listen.owner" = nginx-user;
           "pm" = "dynamic";
@@ -335,14 +337,11 @@ let
           "pm.start_servers" = 2;
           "pm.min_spare_servers" = 1;
           "pm.max_spare_servers" = 3;
+          "chdir" = "/";
+          "php_admin_value[error_log]" = "stderr";
+          "php_admin_flag[log_errors]" = "on";
+          "catch_workers_output" = "yes";
         };
-        extraConfig = ''
-          chdir = /
-          php_admin_value[error_log] = 'stderr'
-          php_admin_flag[log_errors] = on
-          catch_workers_output = yes
-          env[PATH] = ${makeBinPath rutorrent-deps}
-        '';
       };
     };
   };
-- 
cgit v1.2.3