From f40f5b235b890f46770a22f005f8a0f664cf0562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 21 May 2019 02:47:52 +0200 Subject: Replace myPhpfpm with correct overrides --- modules/private/websites/piedsjaloux/integration.nix | 7 ++++--- modules/private/websites/piedsjaloux/production.nix | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'modules/private/websites/piedsjaloux') diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix index 6249e85..83b428a 100644 --- a/modules/private/websites/piedsjaloux/integration.nix +++ b/modules/private/websites/piedsjaloux/integration.nix @@ -13,9 +13,10 @@ in { config = lib.mkIf cfg.enable { secrets.keys = piedsjaloux.keys; - services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux.phpFpm.preStart; - services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux.phpFpm.serviceDeps; - services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux.phpFpm.pool; + systemd.services.phpfpm-piedsjaloux_dev.after = lib.mkAfter piedsjaloux.phpFpm.serviceDeps; + systemd.services.phpfpm-piedsjaloux_dev.wants = piedsjaloux.phpFpm.serviceDeps; + systemd.services.phpfpm-piedsjaloux_dev.preStart = lib.mkAfter piedsjaloux.phpFpm.preStart; + services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux.phpFpm.pool; system.activationScripts.piedsjaloux_dev = piedsjaloux.activationScript; system.extraSystemBuilderCmds = '' mkdir -p $out/webapps diff --git a/modules/private/websites/piedsjaloux/production.nix b/modules/private/websites/piedsjaloux/production.nix index afa1667..0efd56b 100644 --- a/modules/private/websites/piedsjaloux/production.nix +++ b/modules/private/websites/piedsjaloux/production.nix @@ -15,9 +15,10 @@ in { secrets.keys = piedsjaloux.keys; services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; - services.myPhpfpm.preStart.piedsjaloux_prod = piedsjaloux.phpFpm.preStart; - services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux.phpFpm.serviceDeps; - services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux.phpFpm.pool; + systemd.services.phpfpm-piedsjaloux_prod.after = lib.mkAfter piedsjaloux.phpFpm.serviceDeps; + systemd.services.phpfpm-piedsjaloux_prod.wants = piedsjaloux.phpFpm.serviceDeps; + systemd.services.phpfpm-piedsjaloux_prod.preStart = lib.mkAfter piedsjaloux.phpFpm.preStart; + services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux.phpFpm.pool; system.activationScripts.piedsjaloux_prod = piedsjaloux.activationScript; system.extraSystemBuilderCmds = '' mkdir -p $out/webapps -- cgit v1.2.3