[Pkg-php-commits] [php/debian-sid] Update php-fpm.conf(pool.d/www.conf) to do initial chdir to / as suggested by Olaf van der Spek to detect early problems if php5-fpm needs a write access to initial chdir

[Ondřej Surý]

---
 debian/patches/fpm-config.patch |    2 +-
 debian/rules                    |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/debian/patches/fpm-config.patch b/debian/patches/fpm-config.patch
index e279251..9946725 100644
--- a/debian/patches/fpm-config.patch
+++ b/debian/patches/fpm-config.patch
@@ -61,7 +61,7 @@ Last-Update: 2010-07-30
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
 -;chdir = /var/www
-+chdir = /var/www
++chdir = /
   
  ; Redirect worker stdout and stderr into main error log. If not set, stdout and
  ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/debian/rules b/debian/rules
index 11b6e64..4e238fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -531,7 +531,6 @@ install: build
 	# extract the first pool, called "www," from the config file:
 	sed -nr '/('"'"'|\[)www('"'"'|\])/{h;p;d};x;/www/{x;p}' < fpm-build/sapi/fpm/php-fpm.conf \
 	    > debian/php5-fpm/etc/php5/fpm/pool.d/www.conf
-	sed -i -e 's/;chdir = \/var\/www/chdir = \/tmp/' debian/php5-fpm/etc/php5/fpm/pool.d/www.conf
 
 	# move and install -dev files
 	dh_movefiles --sourcedir=debian/libapache2-mod-php5
-- 
1.7.1