X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fsv%2Fphp5-fpm%2Flocal.sh;h=94fbab90be558a8c7d79115065c929549791456c;hb=HEAD;hp=d06341ca098dff03daa1a76233d7d435cf64e3de;hpb=e2ae547ef85e29f3f9c9dfe31feffdac2653df06;p=lhc%2Fateliers.git

diff --git a/etc/sv/php5-fpm/local.sh b/etc/sv/php5-fpm/local.sh
index d06341c..94fbab9 100644
--- a/etc/sv/php5-fpm/local.sh
+++ b/etc/sv/php5-fpm/local.sh
@@ -29,6 +29,9 @@ sudo install -m 440 -o php5 -g php5 \
 sudo install -m 664 -o php5 -g php5 \
  "$tool"/etc/php5/fpm/php.ini \
         /etc/php5/fpm/php.ini
+sudo install -m 664 -o php5 -g php5 \
+ "$tool"/etc/php5/fpm/auto_prepend_file.php \
+        /etc/php5/fpm/auto_prepend_file.php
 for conf in $(
 	test ! -d "$tool"/etc/php5/fpm/conf.d ||
 	find "$tool"/etc/php5/fpm/conf.d \
@@ -46,7 +49,7 @@ for pool in $(
 	 -name "php-fpm.conf" \
 	 -printf '%P\n')
  do pool=${pool%\/php-fpm\.conf}
-	"$tool"/local/adduser php5_"$pool" \
+	"$tool"/local/adduser php_"$pool" \
 	 --disabled-login \
 	 --disabled-password \
 	 --group \
@@ -56,7 +59,7 @@ for pool in $(
 	 --system
 	sudo install -d -m 770 -o php5 -g php5 \
 	 /etc/php5/fpm/pool.d/"$pool"
-	"$tool"/local/adduser log-php5-"$pool" \
+	"$tool"/local/adduser log-php-"$pool" \
 	 --disabled-login \
 	 --disabled-password \
 	 --group \
@@ -67,7 +70,7 @@ for pool in $(
 	sudo install -d -m 1771 -o log-php5 -g log-php5 \
 	 /home/www/log/php5 \
 	 /home/www/log/php5/fpm
-	sudo install -d -m 2770 -o log-php5-"$pool" -g log-php5-"$pool" \
+	sudo install -d -m 2770 -o log-php-"$pool" -g log-php-"$pool" \
 	 /home/www/log/php5/fpm/"$pool"
 	sudo install -m 660 -o php5 -g php5 /dev/stdin \
 	 /etc/php5/fpm/pool.d/"$pool"/php-fpm.conf <<-EOF
@@ -79,7 +82,7 @@ for pool in $(
 		env[TEMP] = /tmp
 		env[TMPDIR] = /tmp
 		env[TMP] = /tmp
-		group = php5_$pool
+		group = php_$pool
 		#listen = 127.0.0.1:9000
 		listen = /run/php5/fpm/$pool
 		#listen.allowed_clients = 127.0.0.1
@@ -100,7 +103,7 @@ for pool in $(
 		rlimit_core = unlimited
 		rlimit_files = 131072
 		slowlog = /home/www/log/php5/fpm/$pool/slow.log
-		user = php5_$pool
+		user = php_$pool
 		$(cat "$tool"/etc/php5/fpm/pool.d/"$pool"/php-fpm.conf)
 		EOF
  done