From 441da8aac378f401625e82caf281fa0e26128310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 30 Mar 2020 23:54:00 +0200
Subject: Use pools instead of deprecated poolConfigs for php

---
 modules/private/websites/tools/git/default.nix  | 7 +++++--
 modules/private/websites/tools/git/mantisbt.nix | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/private/websites/tools/git')

diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index a5f525b..054e47b 100644
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -38,8 +38,11 @@ in {
           ''
       ];
     };
-    services.phpfpm.poolConfigs = {
-      mantisbt = mantisbt.phpFpm.pool;
+    services.phpfpm.pools = {
+      mantisbt = {
+        listen = mantisbt.phpFpm.socket;
+        extraConfig = mantisbt.phpFpm.pool;
+      };
     };
   };
 }
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index 8606819..d75b022 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -78,7 +78,6 @@ rec {
       ++ webRoot.plugins);
     socket = "/var/run/phpfpm/mantisbt.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}
-- 
cgit v1.2.3