X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fsv%2Fphp5-fpm%2Fconfigure.sh;h=25187a79fb6b730516a530e56437aa706fe6c52a;hp=fae43fbec3df806046d7fcb68c162c909971dad7;hb=22f04b9fac14adc3d3fc98273ba126c3a51792c3;hpb=24a51b59fbeca7d8c49e71427aa0ed2a9d0f2701

diff --git a/etc/sv/php5-fpm/configure.sh b/etc/sv/php5-fpm/configure.sh
index fae43fb..25187a7 100644
--- a/etc/sv/php5-fpm/configure.sh
+++ b/etc/sv/php5-fpm/configure.sh
@@ -1,7 +1,7 @@
-rule apt_get_install php5-fpm php-apc php5-mysql
+rule apt_get_install php5-fpm php-apc php5-mysql php5-gd
 rule insserv_remove  php5-fpm
 
-rule www_configure
+rule _www_configure
 
 rule adduser php5 \
  --disabled-login \
@@ -26,10 +26,15 @@ sudo install -d -m 770 -o php5 -g php5 \
 sudo install -m 440 -o php5 -g php5 \
  "$tool"/etc/php5/fpm/php-fpm.conf \
         /etc/php5/fpm/php-fpm.conf
-for conf in $(find "$tool"/etc/php5/fpm/conf.d \
- -mindepth 1 -maxdepth 1 -type f \
- -name '*.conf' \
- -printf '%f\n' || true)
+sudo install -m 664 -o php5 -g php5 \
+ "$tool"/etc/php5/fpm/php.ini \
+				/etc/php5/fpm/php.ini
+for conf in $(
+	test ! -d "$tool"/etc/php5/fpm/conf.d ||
+	find "$tool"/etc/php5/fpm/conf.d \
+	 -mindepth 1 -maxdepth 1 -type f \
+	 -name '*.conf' \
+	 -printf '%f\n')
  do
 	sudo install -m 660 -o php5 -g php5 \
 	 "$tool"/etc/php5/fpm/conf.d/"$conf" \
@@ -40,7 +45,7 @@ for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \
  -false ${@:+$(printf -- '-or -name %s.conf\n' "$@")} \
  -printf '%f\n')
  do pool=${pool%\.conf}
-	rule adduser "$pool"__php5 \
+	rule adduser php5_"$pool" \
 	 --disabled-login \
 	 --disabled-password \
 	 --group \
@@ -71,7 +76,7 @@ for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \
 		env[TEMP] = /tmp
 		env[TMPDIR] = /tmp
 		env[TMP] = /tmp
-		group = ${pool}__php5
+		group = php5_$pool
 		#listen = 127.0.0.1:9000
 		listen = /run/php5/fpm/$pool
 		#listen.allowed_clients = 127.0.0.1
@@ -91,10 +96,7 @@ for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \
 		rlimit_core = unlimited
 		rlimit_files = 131072
 		slowlog = /home/www/log/php5/fpm/$pool/slow.log
-		user = ${pool}__php5
-		$(cat "$tool"/etc/php5/fpm/pool.d/"$conf")
+		user = php5_$pool
+		$(cat "$tool"/etc/php5/fpm/pool.d/"$pool".conf)
 		EOF
-	sudo install -m 664 -o php5 -g php5 \
-	 "$tool"/etc/php5/fpm/php.ini \
-	        /etc/php5/fpm/php.ini
  done