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/piedsjaloux | |
| 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/piedsjaloux')
| -rw-r--r-- | modules/private/websites/piedsjaloux/integration.nix | 7 | ||||
| -rw-r--r-- | modules/private/websites/piedsjaloux/production.nix | 7 |
2 files changed, 8 insertions, 6 deletions
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 { | |||
| 13 | 13 | ||
| 14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
| 15 | secrets.keys = piedsjaloux.keys; | 15 | secrets.keys = piedsjaloux.keys; |
| 16 | services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux.phpFpm.preStart; | 16 | systemd.services.phpfpm-piedsjaloux_dev.after = lib.mkAfter piedsjaloux.phpFpm.serviceDeps; |
| 17 | services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux.phpFpm.serviceDeps; | 17 | systemd.services.phpfpm-piedsjaloux_dev.wants = piedsjaloux.phpFpm.serviceDeps; |
| 18 | services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux.phpFpm.pool; | 18 | systemd.services.phpfpm-piedsjaloux_dev.preStart = lib.mkAfter piedsjaloux.phpFpm.preStart; |
| 19 | services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux.phpFpm.pool; | ||
| 19 | system.activationScripts.piedsjaloux_dev = piedsjaloux.activationScript; | 20 | system.activationScripts.piedsjaloux_dev = piedsjaloux.activationScript; |
| 20 | system.extraSystemBuilderCmds = '' | 21 | system.extraSystemBuilderCmds = '' |
| 21 | mkdir -p $out/webapps | 22 | 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 { | |||
| 15 | secrets.keys = piedsjaloux.keys; | 15 | secrets.keys = piedsjaloux.keys; |
| 16 | services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; | 16 | services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; |
| 17 | 17 | ||
| 18 | services.myPhpfpm.preStart.piedsjaloux_prod = piedsjaloux.phpFpm.preStart; | 18 | systemd.services.phpfpm-piedsjaloux_prod.after = lib.mkAfter piedsjaloux.phpFpm.serviceDeps; |
| 19 | services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux.phpFpm.serviceDeps; | 19 | systemd.services.phpfpm-piedsjaloux_prod.wants = piedsjaloux.phpFpm.serviceDeps; |
| 20 | services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux.phpFpm.pool; | 20 | systemd.services.phpfpm-piedsjaloux_prod.preStart = lib.mkAfter piedsjaloux.phpFpm.preStart; |
| 21 | services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux.phpFpm.pool; | ||
| 21 | system.activationScripts.piedsjaloux_prod = piedsjaloux.activationScript; | 22 | system.activationScripts.piedsjaloux_prod = piedsjaloux.activationScript; |
| 22 | system.extraSystemBuilderCmds = '' | 23 | system.extraSystemBuilderCmds = '' |
| 23 | mkdir -p $out/webapps | 24 | mkdir -p $out/webapps |