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/florian | |
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/florian')
-rw-r--r-- | modules/private/websites/florian/app.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix index 08506e1..905c66a 100644 --- a/modules/private/websites/florian/app.nix +++ b/modules/private/websites/florian/app.nix | |||
@@ -15,9 +15,10 @@ in { | |||
15 | 15 | ||
16 | config = lib.mkIf cfg.enable { | 16 | config = lib.mkIf cfg.enable { |
17 | secrets.keys = tellesflorian.keys; | 17 | secrets.keys = tellesflorian.keys; |
18 | services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian.phpFpm.preStart; | 18 | systemd.services.phpfpm-tellesflorian_dev.after = lib.mkAfter tellesflorian.phpFpm.serviceDeps; |
19 | services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian.phpFpm.serviceDeps; | 19 | systemd.services.phpfpm-tellesflorian_dev.wants = tellesflorian.phpFpm.serviceDeps; |
20 | services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool; | 20 | systemd.services.phpfpm-tellesflorian_dev.preStart = lib.mkAfter tellesflorian.phpFpm.preStart; |
21 | services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool; | ||
21 | system.activationScripts.tellesflorian_dev = tellesflorian.activationScript; | 22 | system.activationScripts.tellesflorian_dev = tellesflorian.activationScript; |
22 | system.extraSystemBuilderCmds = '' | 23 | system.extraSystemBuilderCmds = '' |
23 | mkdir -p $out/webapps | 24 | mkdir -p $out/webapps |