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

diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix
index 384b324..f8d8b53 100644
--- a/modules/private/websites/aten/integration.nix
+++ b/modules/private/websites/aten/integration.nix
@@ -12,14 +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;
-    systemd.services.phpfpm-aten_dev.preStart = lib.mkAfter aten.phpFpm.preStart;
-    systemd.services.phpfpm-aten_dev.after = lib.mkAfter aten.phpFpm.serviceDeps;
-    systemd.services.phpfpm-aten_dev.wants = aten.phpFpm.serviceDeps;
     services.phpfpm.poolConfigs.aten_dev = aten.phpFpm.pool;
-    system.activationScripts.aten_dev = aten.activationScript;
-    myServices.websites.webappDirs."${aten.apache.webappName}" = aten.app.webRoot;
-    services.websites.integration.modules = aten.apache.modules;
     services.websites.integration.vhostConfs.aten = {
       certName    = "eldiron";
       addToCerts  = true;
@@ -27,9 +39,5 @@ in {
       root        = aten.apache.root;
       extraConfig = [ aten.apache.vhostConf ];
     };
-    services.websites.integration.watchPaths = [
-      "/var/secrets/webapps/${aten.app.environment}-aten"
-    ];
   };
 }
-