X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fsv%2Fphp5-fpm%2Flocal.sh;h=5d99315cf15193a5c368f7568a5d5af9526653bb;hp=d06341ca098dff03daa1a76233d7d435cf64e3de;hb=9075978ae94310fa7a27d9881d3cecc6150ca3e9;hpb=8861456f050ddaa2797cd93e9d2b7808b282d289

diff --git a/etc/sv/php5-fpm/local.sh b/etc/sv/php5-fpm/local.sh
index d06341c..5d99315 100644
--- a/etc/sv/php5-fpm/local.sh
+++ b/etc/sv/php5-fpm/local.sh
@@ -46,7 +46,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 +56,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 +67,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 +79,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 +100,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