aboutsummaryrefslogtreecommitdiff
path: root/virtual/modules/websites/piedsjaloux
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-12 01:15:55 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-12 01:15:55 +0100
commit985845405f0ddd6531e4392e899a31179cde70d6 (patch)
tree393dcb6f389622fef74926d25158653ea4d9be6d /virtual/modules/websites/piedsjaloux
parentf3d9c61e9becccc9ef25f64e5e639d45ea25650a (diff)
downloadNix-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/piedsjaloux')
-rw-r--r--virtual/modules/websites/piedsjaloux/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/virtual/modules/websites/piedsjaloux/default.nix b/virtual/modules/websites/piedsjaloux/default.nix
index bf74173..80261a3 100644
--- a/virtual/modules/websites/piedsjaloux/default.nix
+++ b/virtual/modules/websites/piedsjaloux/default.nix
@@ -36,7 +36,7 @@ in {
36 }; 36 };
37 }; 37 };
38 38
39 services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; 39 services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
40 system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; 40 system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
41 services.myWebsites.production.modules = piedsjaloux_prod.apache.modules; 41 services.myWebsites.production.modules = piedsjaloux_prod.apache.modules;
42 services.myWebsites.production.vhostConfs.piedsjaloux = { 42 services.myWebsites.production.vhostConfs.piedsjaloux = {
@@ -48,7 +48,7 @@ in {
48 }) 48 })
49 (lib.mkIf cfg.integration.enable { 49 (lib.mkIf cfg.integration.enable {
50 security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; 50 security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
51 services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; 51 services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
52 system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; 52 system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
53 services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules; 53 services.myWebsites.integration.modules = piedsjaloux_dev.apache.modules;
54 services.myWebsites.integration.vhostConfs.piedsjaloux = { 54 services.myWebsites.integration.vhostConfs.piedsjaloux = {