Make goaccess a template

[perso/Immae/Config/Nix.git] / nixops / modules / websites / piedsjaloux / default.nix

diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index 1c6864c861ded6deb3b95133376bbfe7069ec05f..165791416bf876583f1acb4190a1a9bb85bc4d6c 100644 (file)
--- a/nixops/modules/websites/piedsjaloux/default.nix
+++ b/nixops/modules/websites/piedsjaloux/default.nix
@@ -25,13 +25,10 @@ in {
 
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      deployment.keys = piedsjaloux_prod.keys;
+      secrets.keys = piedsjaloux_prod.keys;
       services.myWebsites.commons.stats.enable = true;
       services.myWebsites.commons.stats.sites = [
-        {
-          name = "piedsjaloux.fr";
-          conf = ./goaccess.conf;
-        }
+        { name = "piedsjaloux.fr"; }
       ];
 
       security.acme.certs."piedsjaloux" = config.services.myCertificates.certConfig // {
@@ -41,6 +38,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 = ''
@@ -56,8 +55,10 @@ in {
       };
     })
     (lib.mkIf cfg.integration.enable {
-      deployment.keys = piedsjaloux_dev.keys;
+      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 = ''