From 3e5040747ce990bcb6d86f052dd631f57ab08ea2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 28 Oct 2019 07:38:07 +0100
Subject: shack/muellshack: mkYarnPackage is not vendored anymore, using
 pkgs.yarn2nix-moretea.mkYarnPackage

---
 krebs/2configs/shack/muellshack.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix
index 9168c9ba..179855c4 100644
--- a/krebs/2configs/shack/muellshack.nix
+++ b/krebs/2configs/shack/muellshack.nix
@@ -6,7 +6,7 @@ let
       url = "https://git.shackspace.de/rz/muellshack";
       rev = "d8a5e2d4c0a22804838675ac42b468299dcd9a76";
       sha256 = "0ff6q64dgdxmpszp94z100fdic175b1vvxn4crg8p0jcabzxsv0m";
-    }) {};
+    }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
     home = "/var/lib/muellshack";
     port = "8081";
 in {
-- 
cgit v1.2.3


From f566e3433574bcecdcdee2528d73a9d202be62f6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 28 Oct 2019 11:00:11 +0100
Subject: rtorrent module: set listen.owner in phpfpm

---
 krebs/3modules/rtorrent.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index d5956931..1f88a49e 100644
--- a/krebs/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -8,7 +8,7 @@ let
 
   nginx-user = config.services.nginx.user;
   nginx-group = config.services.nginx.group;
-  fpm-socket = "/var/run/php5-fpm-rutorrent.sock";
+  fpm-socket = config.services.phpfpm.pools.rutorrent.socket;
 
   webdir = rucfg.webdir;
   systemd-logfile = cfg.workDir + "/rtorrent-systemd.log";
@@ -332,12 +332,11 @@ let
 
   rutorrent-imp = {
     services.phpfpm = {
-      # phpfpm does not have an enable option
       pools.rutorrent = {
         user =  nginx-user;
         group =  nginx-group;
-        listen = fpm-socket;
         settings = {
+          "listen.owner" = nginx-user;
           "pm" = "dynamic";
           "pm.max_children" = 5;
           "pm.start_servers" = 2;
-- 
cgit v1.2.3