2 files changed, 8 insertions, 6 deletions

diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix
index 790c5a9..5ccc0c1 100644
--- a/modules/private/websites/aten/integration.nix
+++ b/modules/private/websites/aten/integration.nix
@@ -13,9 +13,10 @@ in {
 
   config = lib.mkIf cfg.enable {
     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;
+    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;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
diff --git a/modules/private/websites/aten/production.nix b/modules/private/websites/aten/production.nix
index 697f1b8..7938241 100644
--- a/modules/private/websites/aten/production.nix
+++ b/modules/private/websites/aten/production.nix
@@ -15,9 +15,10 @@ in {
     secrets.keys = aten.keys;
     services.webstats.sites = [ { name = "aten.pro"; } ];
 
-    services.myPhpfpm.preStart.aten_prod = aten.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.aten_prod = aten.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.aten_prod = aten.phpFpm.pool;
+    systemd.services.phpfpm-aten_prod.preStart = lib.mkAfter aten.phpFpm.preStart;
+    systemd.services.phpfpm-aten_prod.after = lib.mkAfter aten.phpFpm.serviceDeps;
+    systemd.services.phpfpm-aten_prod.wants = aten.phpFpm.serviceDeps;
+    services.phpfpm.poolConfigs.aten_prod = aten.phpFpm.pool;
     system.activationScripts.aten_prod = aten.activationScript;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps