Replace myPhpfpm with correct overrides

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / cloud.nix

diff --git a/nixops/modules/websites/tools/cloud.nix b/nixops/modules/websites/tools/cloud.nix
index 69b5fb07dabd2e6889768e8b07fc453137ef0b86..5d2ca401a67eabbe7b002195b851bfbac7d22c19 100644 (file)
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -17,7 +17,6 @@ let
       zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
       '';
     pool = ''
-      listen = ${socket}
       user = wwwrun
       group = wwwrun
       listen.owner = wwwrun
@@ -49,12 +48,11 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."eldiron".extraDomains."cloud.immae.eu" = null;
-
     services.websites.tools.modules = [ "proxy_fcgi" ];
 
     services.websites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["cloud.immae.eu" ];
       root        = apacheRoot;
       extraConfig = [
@@ -171,9 +169,10 @@ in {
       ln -s ${nextcloud} $out/webapps/${webappName}
       '';
 
-    services.myPhpfpm = {
-      poolPhpConfigs.nextcloud = phpFpm.phpConfig;
-      poolConfigs.nextcloud = phpFpm.pool;
+    services.phpfpm.pools.nextcloud = {
+      listen = phpFpm.socket;
+      extraConfig = phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
     };
 
     services.cron = {