X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fpiedsjaloux%2Fdefault.nix;h=9f9697d26dc0c18ef0ff9d51045b32144d7de96f;hb=9eae2b47b7b315b05a0e010f3003bd875685e260;hp=54e063db07e7b680d9bb5addc50b8fb8e7ffccbc;hpb=7da3ceece7fe6c49046e97f37fc353db9b8a981c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index 54e063d..9f9697d 100644
--- a/nixops/modules/websites/piedsjaloux/default.nix
+++ b/nixops/modules/websites/piedsjaloux/default.nix
@@ -19,19 +19,10 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
-        {
-          name = "piedsjaloux.fr";
-          conf = ./goaccess.conf;
-        }
-      ];
+      secrets.keys = piedsjaloux_prod.keys;
+      services.webstats.sites = [ { name = "piedsjaloux.fr"; } ];
 
       security.acme.certs."piedsjaloux" = config.services.myCertificates.certConfig // {
         domain = "piedsjaloux.fr";
@@ -40,6 +31,8 @@ in {
         };
       };
 
+      services.myPhpfpm.preStart.piedsjaloux_prod = piedsjaloux_prod.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
       system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
       system.extraSystemBuilderCmds = ''
@@ -55,7 +48,10 @@ in {
       };
     })
     (lib.mkIf cfg.integration.enable {
+      secrets.keys = piedsjaloux_dev.keys;
       security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
+      services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux_dev.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
       system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
       system.extraSystemBuilderCmds = ''