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/aten/default.nix | |
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/aten/default.nix')
-rw-r--r-- | virtual/modules/websites/aten/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virtual/modules/websites/aten/default.nix b/virtual/modules/websites/aten/default.nix index d9db75c..2f319bb 100644 --- a/virtual/modules/websites/aten/default.nix +++ b/virtual/modules/websites/aten/default.nix | |||
@@ -36,7 +36,7 @@ in { | |||
36 | }; | 36 | }; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | services.phpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool; | 39 | services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool; |
40 | system.activationScripts.aten_prod = aten_prod.activationScript; | 40 | system.activationScripts.aten_prod = aten_prod.activationScript; |
41 | services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules; | 41 | services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules; |
42 | services.myWebsites.production.modules = aten_prod.apache.modules; | 42 | services.myWebsites.production.modules = aten_prod.apache.modules; |
@@ -49,7 +49,7 @@ in { | |||
49 | }) | 49 | }) |
50 | (lib.mkIf cfg.integration.enable { | 50 | (lib.mkIf cfg.integration.enable { |
51 | security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null; | 51 | security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null; |
52 | services.phpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool; | 52 | services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool; |
53 | system.activationScripts.aten_dev = aten_dev.activationScript; | 53 | system.activationScripts.aten_dev = aten_dev.activationScript; |
54 | services.myWebsites.integration.modules = aten_dev.apache.modules; | 54 | services.myWebsites.integration.modules = aten_dev.apache.modules; |
55 | services.myWebsites.integration.vhostConfs.aten = { | 55 | services.myWebsites.integration.vhostConfs.aten = { |