diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-21 02:47:52 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-21 02:47:52 +0200 |
commit | f40f5b235b890f46770a22f005f8a0f664cf0562 (patch) | |
tree | 60bbcac4b528324fe7e83f280d65190b57bb810a /modules/private/websites/connexionswing/integration.nix | |
parent | 1480d60775dcd38b33abd367a91cd1b865aacc54 (diff) | |
download | Nix-f40f5b235b890f46770a22f005f8a0f664cf0562.tar.gz Nix-f40f5b235b890f46770a22f005f8a0f664cf0562.tar.zst Nix-f40f5b235b890f46770a22f005f8a0f664cf0562.zip |
Replace myPhpfpm with correct overrides
Diffstat (limited to 'modules/private/websites/connexionswing/integration.nix')
-rw-r--r-- | modules/private/websites/connexionswing/integration.nix | 12 |
1 files changed, 8 insertions, 4 deletions
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 { | |||
13 | 13 | ||
14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
15 | secrets.keys = connexionswing.keys; | 15 | secrets.keys = connexionswing.keys; |
16 | services.myPhpfpm.preStart.connexionswing_dev = connexionswing.phpFpm.preStart; | 16 | systemd.services.phpfpm-connexionswing_dev.after = lib.mkAfter connexionswing.phpFpm.serviceDeps; |
17 | services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing.phpFpm.serviceDeps; | 17 | systemd.services.phpfpm-connexionswing_dev.wants = connexionswing.phpFpm.serviceDeps; |
18 | services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing.phpFpm.pool; | 18 | systemd.services.phpfpm-connexionswing_dev.preStart = lib.mkAfter connexionswing.phpFpm.preStart; |
19 | services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing.phpFpm.phpConfig; | 19 | services.phpfpm.pools.connexionswing_dev = { |
20 | listen = connexionswing.phpFpm.socket; | ||
21 | extraConfig = connexionswing.phpFpm.pool; | ||
22 | phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig; | ||
23 | }; | ||
20 | system.activationScripts.connexionswing_dev = connexionswing.activationScript; | 24 | system.activationScripts.connexionswing_dev = connexionswing.activationScript; |
21 | system.extraSystemBuilderCmds = '' | 25 | system.extraSystemBuilderCmds = '' |
22 | mkdir -p $out/webapps | 26 | mkdir -p $out/webapps |