From 41c8aa8d63a57b7b01f28c5f4c31fac1b1ff25ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 21 Aug 2016 21:09:34 +0200 Subject: [PATCH 1/2] php: change config-file-scan-dir from /etc to /etc/php.d By chance I noticed that php picked up my /etc/odbc.ini file (clearly wrong!). This fixes it by adding a namespace for php. WARNING: This is a breaking change for anyone that happen to rely on php picking up .ini files from /etc. --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 9ae5865b0d7..5c8b9de331f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -270,7 +270,7 @@ let done [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags + ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags ''; postInstall = '' From 351d124376bbaaeb5c7f152aa0d499c116e08430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 22 Aug 2016 21:24:05 +0200 Subject: [PATCH 2/2] nixos/release-notes: PHP config-file-scan-dir /etc -> /etc/php.d --- nixos/doc/manual/release-notes/rl-1609.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 70759ee25f8..8bae29d60f0 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -90,6 +90,13 @@ following incompatible changes: Use security.audit.enable = true; to explicitly enable it. + + PHP now scans for extra configuration .ini files in /etc/php.d + instead of /etc. This prevents accidentally loading non-PHP .ini files + that may be in /etc. + + +