summary refs log tree commit diff
path: root/nixos/modules/services/web-servers/apache-httpd/default.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-04-16 22:52:52 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-04-17 14:38:29 +0200
commitc214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980 (patch)
treeb5a6e84551ef9b31b0bed12df53733eb7b252640 /nixos/modules/services/web-servers/apache-httpd/default.nix
parent16477d764f375ef7b81acbfd13189299ff67f233 (diff)
downloadnixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.tar
nixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.tar.gz
nixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.tar.bz2
nixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.tar.lz
nixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.tar.xz
nixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.tar.zst
nixpkgs-c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980.zip
nixos/httpd: Use extensions from php package
After the recent rewrite, enabled extensions are passed to php programs
through an extra ini file by a wrapper. Since httpd uses shared module
instead of program, the wrapper did not affect it and no extensions
other than built-ins were loaded.

To fix this, we are passing the extension config another way – by adding it
to the service's generated config.

For now we are hardcoding the path to the ini file. It would be nice to add
the path to the passthru and use that once the PHP expression settles down.
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/default.nix')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 832c8b30ee9..faefd1bfd09 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -338,6 +338,7 @@ let
     }
     ''
       cat ${php}/etc/php.ini > $out
+      cat ${php}/lib/custom-php.ini > $out
       echo "$options" >> $out
     '';