diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-12 01:15:55 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-12 01:15:55 +0100 |
commit | 985845405f0ddd6531e4392e899a31179cde70d6 (patch) | |
tree | 393dcb6f389622fef74926d25158653ea4d9be6d /virtual/modules/websites/ludivine | |
parent | f3d9c61e9becccc9ef25f64e5e639d45ea25650a (diff) | |
download | Nix-985845405f0ddd6531e4392e899a31179cde70d6.tar.gz Nix-985845405f0ddd6531e4392e899a31179cde70d6.tar.zst Nix-985845405f0ddd6531e4392e899a31179cde70d6.zip |
Refactor a bit the php-fpm module
This commit adds a new phpfpm service with a new option that permits to
specify pool-specific php configuration (caveat: now each pool has
distinct php ini file, even if they have the same content)
Make sure that the same php package is used everywhere
Build pdo_mysql using mysql c-connector. Would be good to have the same
with mysqli but it seems not to work
Diffstat (limited to 'virtual/modules/websites/ludivine')
-rw-r--r-- | virtual/modules/websites/ludivine/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virtual/modules/websites/ludivine/default.nix b/virtual/modules/websites/ludivine/default.nix index ed719ba..6aa1862 100644 --- a/virtual/modules/websites/ludivine/default.nix +++ b/virtual/modules/websites/ludivine/default.nix | |||
@@ -32,7 +32,7 @@ in { | |||
32 | }; | 32 | }; |
33 | }; | 33 | }; |
34 | 34 | ||
35 | services.phpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool; | 35 | services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool; |
36 | system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript; | 36 | system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript; |
37 | services.myWebsites.production.modules = ludivinecassal_prod.apache.modules; | 37 | services.myWebsites.production.modules = ludivinecassal_prod.apache.modules; |
38 | services.myWebsites.production.vhostConfs.ludivine = { | 38 | services.myWebsites.production.vhostConfs.ludivine = { |
@@ -45,7 +45,7 @@ in { | |||
45 | (lib.mkIf cfg.integration.enable { | 45 | (lib.mkIf cfg.integration.enable { |
46 | security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null; | 46 | security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null; |
47 | 47 | ||
48 | services.phpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool; | 48 | services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool; |
49 | system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript; | 49 | system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript; |
50 | services.myWebsites.apacheConfig.ludivinecassal_dev.modules = ludivinecassal_dev.apache.modules; | 50 | services.myWebsites.apacheConfig.ludivinecassal_dev.modules = ludivinecassal_dev.apache.modules; |
51 | services.myWebsites.integration.modules = ludivinecassal_dev.apache.modules; | 51 | services.myWebsites.integration.modules = ludivinecassal_dev.apache.modules; |