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/dav/davical.nix | 1 -
 modules/private/websites/tools/dav/default.nix | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index 2a02f5e..5eb3fab 100644
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/modules/private/websites/tools/dav/davical.nix
@@ -113,7 +113,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ];
     socket = "/var/run/phpfpm/davical.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index c74930a..0012965 100644
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -42,8 +42,11 @@ in {
       ];
     };
 
-    services.phpfpm.poolConfigs = {
-      davical = davical.phpFpm.pool;
+    services.phpfpm.pools = {
+      davical = {
+        listen = davical.phpFpm.socket;
+        extraConfig = davical.phpFpm.pool;
+      };
     };
 
     myServices.websites.webappDirs._dav = ./www;
-- 
cgit v1.2.3