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 a7fcd6149a086aea15b91e122bca1012f315719d..5d2ca401a67eabbe7b002195b851bfbac7d22c19 100644 (file)
--- a/nixops/modules/websites/tools/cloud.nix
+++ b/nixops/modules/websites/tools/cloud.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps);
   env = myconfig.env.tools.nextcloud;
@@ -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.myWebsites.tools.modules = [ "proxy_fcgi" ];
-
-    services.myWebsites.tools.vhostConfs.cloud = {
+    services.websites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["cloud.immae.eu" ];
       root        = apacheRoot;
       extraConfig = [
@@ -80,7 +78,7 @@ in {
       ];
     };
 
-    mySecrets.keys = [{
+    secrets.keys = [{
       dest = "webapps/tools-nextcloud";
       user = "wwwrun";
       group = "wwwrun";
@@ -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 = {