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/packages | |
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/packages')
-rw-r--r-- | virtual/packages/nextcloud.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/virtual/packages/nextcloud.nix b/virtual/packages/nextcloud.nix index 3ac71e0..b8d8e59 100644 --- a/virtual/packages/nextcloud.nix +++ b/virtual/packages/nextcloud.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { stdenv, fetchurl, checkEnv, writeText, lib }: | 1 | { stdenv, fetchurl, checkEnv, writeText, lib, phpPackages, php }: |
2 | let | 2 | let |
3 | nextcloud = let | 3 | nextcloud = let |
4 | # FIXME: initial sync | 4 | # FIXME: initial sync |
@@ -231,6 +231,11 @@ let | |||
231 | [ webRoot varDir config ] | 231 | [ webRoot varDir config ] |
232 | ++ lib.attrsets.mapAttrsToList (name: value: value) apps); | 232 | ++ lib.attrsets.mapAttrsToList (name: value: value) apps); |
233 | socket = "/var/run/phpfpm/nextcloud.sock"; | 233 | socket = "/var/run/phpfpm/nextcloud.sock"; |
234 | phpConfig = '' | ||
235 | extension=${phpPackages.redis}/lib/php/extensions/redis.so | ||
236 | extension=${phpPackages.apcu}/lib/php/extensions/apcu.so | ||
237 | zend_extension=${php}/lib/php/extensions/opcache.so | ||
238 | ''; | ||
234 | pool = '' | 239 | pool = '' |
235 | listen = ${socket} | 240 | listen = ${socket} |
236 | user = ${apache.user} | 241 | user = ${apache.user} |