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/connexionswing/integration.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'modules/private/websites/connexionswing/integration.nix') diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix index c3425bd..6570977 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix @@ -13,10 +13,14 @@ in { config = lib.mkIf cfg.enable { secrets.keys = connexionswing.keys; - services.myPhpfpm.preStart.connexionswing_dev = connexionswing.phpFpm.preStart; - services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing.phpFpm.serviceDeps; - services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing.phpFpm.pool; - services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing.phpFpm.phpConfig; + systemd.services.phpfpm-connexionswing_dev.after = lib.mkAfter connexionswing.phpFpm.serviceDeps; + systemd.services.phpfpm-connexionswing_dev.wants = connexionswing.phpFpm.serviceDeps; + systemd.services.phpfpm-connexionswing_dev.preStart = lib.mkAfter connexionswing.phpFpm.preStart; + services.phpfpm.pools.connexionswing_dev = { + listen = connexionswing.phpFpm.socket; + extraConfig = connexionswing.phpFpm.pool; + phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig; + }; system.activationScripts.connexionswing_dev = connexionswing.activationScript; system.extraSystemBuilderCmds = '' mkdir -p $out/webapps -- cgit v1.2.3