X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Faten%2Fintegration.nix;h=f8d8b53283cd8b79e1cf33f9bcfa241e85c7e9d5;hb=2e48907d64491a06454b342a1a56d03a0835753d;hp=790c5a93998596635b5ca3df465f7a92eb4e6ba4;hpb=f8026b6e4c869aa108f6361c8ccd50890657994d;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix
index 790c5a9..f8d8b53 100644
--- a/modules/private/websites/aten/integration.nix
+++ b/modules/private/websites/aten/integration.nix
@@ -12,16 +12,26 @@ in {
   options.myServices.websites.aten.integration.enable = lib.mkEnableOption "enable Aten's website in integration";
 
   config = lib.mkIf cfg.enable {
+    services.phpApplication.aten_dev = let
+      app = pkgs.webapps.aten.override { environment = "dev"; };
+    in {
+      websiteEnv = "integration";
+      httpdUser = config.services.httpd.Inte.user;
+      httpdGroup = config.services.httpd.Inte.group;
+      inherit (app) webRoot varDir;
+      inherit app;
+      serviceDeps = [ "postgresql.service" ];
+      preStartActions = [
+        "APP_ENV=${app.environment} ./bin/console --env=${app.environment} cache:clear --no-warmup"
+      ];
+      watchFiles = [
+        "${config.secrets.location}/webapps/${app.environment}-aten"
+      ];
+      webappName = "aten_dev";
+    };
+
     secrets.keys = aten.keys;
-    services.myPhpfpm.preStart.aten_dev = aten.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.aten_dev = aten.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.aten_dev = aten.phpFpm.pool;
-    system.activationScripts.aten_dev = aten.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${aten.app.webRoot} $out/webapps/${aten.apache.webappName}
-      '';
-    services.websites.integration.modules = aten.apache.modules;
+    services.phpfpm.poolConfigs.aten_dev = aten.phpFpm.pool;
     services.websites.integration.vhostConfs.aten = {
       certName    = "eldiron";
       addToCerts  = true;
@@ -31,4 +41,3 @@ in {
     };
   };
 }
-