-rule apt_get_install php5-fpm php-apc
+rule apt_get_install php5-fpm php-apc php5-mysql
rule insserv_remove php5-fpm
rule www_configure
sudo ln -fns \
/etc/php5/fpm \
/home/www/etc/php5
-sudo rm -rf \
- /etc/php5/fpm/conf.d \
- /etc/php5/fpm/pool.d
sudo install -d -m 770 -o php5 -g php5 \
/etc/php5/fpm/conf.d \
/etc/php5/fpm/pool.d
sudo install -m 440 -o php5 -g php5 \
"$tool"/etc/php5/fpm/php-fpm.conf \
/etc/php5/fpm/php-fpm.conf
-local conf
-#for conf in "$tool"/etc/php5/fpm/conf.d/*.conf
-# do conf=${conf#"$tool"/etc/php5/fpm/conf.d/}
-# sudo install -m 660 -o php5 -g php5 \
-# "$tool"/etc/php5/fpm/conf.d/"$conf" \
-# /etc/php5/fpm/conf.d/"$conf"
-# done
-for conf in "$tool"/etc/php5/fpm/pool.d/*.conf
- do conf=${conf#"$tool"/etc/php5/fpm/pool.d/}
- IFS=. read -r pool <<-EOF
- ${conf%.conf}
- EOF
- assert 'test "${pool:+set}"'
- rule adduser php5-"$pool" \
+for conf in $(find "$tool"/etc/php5/fpm/conf.d \
+ -mindepth 1 -maxdepth 1 -type f \
+ -name '*.conf' \
+ -printf '%f\n' || true)
+ do
+ sudo install -m 660 -o php5 -g php5 \
+ "$tool"/etc/php5/fpm/conf.d/"$conf" \
+ /etc/php5/fpm/conf.d/"$conf"
+ done
+for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \
+ -mindepth 1 -maxdepth 1 -type d \
+ -false ${@:+$(printf -- '-or -name %s.conf\n' "$@")} \
+ -printf '%f\n')
+ do pool=${pool%\.conf}
+ rule adduser "$pool"__php5 \
--disabled-login \
--disabled-password \
--group \
env[TEMP] = /tmp
env[TMPDIR] = /tmp
env[TMP] = /tmp
- group = php5-$pool
+ group = ${pool}__php5
#listen = 127.0.0.1:9000
listen = /run/php5/fpm/$pool
#listen.allowed_clients = 127.0.0.1
rlimit_core = unlimited
rlimit_files = 131072
slowlog = /home/www/log/php5/fpm/$pool/slow.log
- user = php5-$pool
+ user = ${pool}__php5
$(cat "$tool"/etc/php5/fpm/pool.d/"$conf")
EOF
sudo install -m 664 -o php5 -g php5 \