diff options
| author | lassulus <lassulus@lassul.us> | 2019-10-31 08:43:51 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-10-31 08:43:51 +0100 |
| commit | 36fb248f88224490a4bdebe2d401d81f1c9875ae (patch) | |
| tree | fcb413cc9545bbb6d538e6a86efaa1f4de94480b /krebs | |
| parent | 2e4841969a0e10be10bae5f2b937aa74c5311de1 (diff) | |
| parent | dc543a7d507bd431dae20c77800ec877205f5108 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/2configs/shack/muellshack.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/rtorrent.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix index 9168c9ba7..179855c4c 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 { diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index d59569317..1f88a49e1 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; |