X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fludivine%2Fdefault.nix;h=af18d71d93a6c454993aa946faec0a793edc7e72;hb=b7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c;hp=220f5c2b43657a4c6b36d900c83d4e06d85ee385;hpb=6e23a06b9d5e0bdb21c737285e36dbe76b2d3ac1;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index 220f5c2..af18d71 100644
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -21,13 +21,10 @@ in {
 
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      deployment.keys = ludivinecassal_prod.keys;
+      secrets.keys = ludivinecassal_prod.keys;
       services.myWebsites.commons.stats.enable = true;
       services.myWebsites.commons.stats.sites = [
-        {
-          name = "ludivinecassal.com";
-          conf = ./goaccess.conf;
-        }
+        { name = "ludivinecassal.com"; }
       ];
 
       security.acme.certs."ludivinecassal" = config.services.myCertificates.certConfig // {
@@ -37,6 +34,8 @@ in {
         };
       };
 
+      services.myPhpfpm.preStart.ludivinecassal_prod = ludivinecassal_prod.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal_prod.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
       system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript;
       system.extraSystemBuilderCmds = ''
@@ -52,9 +51,11 @@ in {
       };
     })
     (lib.mkIf cfg.integration.enable {
-      deployment.keys = ludivinecassal_dev.keys;
+      secrets.keys = ludivinecassal_dev.keys;
       security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null;
 
+      services.myPhpfpm.preStart.ludivinecassal_dev = ludivinecassal_dev.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.ludivinecassal_dev = ludivinecassal_dev.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool;
       system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript;
       system.extraSystemBuilderCmds = ''