Ajout : etc/sv/sympa/ .

[lhc/ateliers.git] / etc / sv / php5-fpm / configure.sh

diff --git a/etc/sv/php5-fpm/configure.sh b/etc/sv/php5-fpm/configure.sh
index 5639822..d349e1f 100644 (file)
--- a/etc/sv/php5-fpm/configure.sh
+++ b/etc/sv/php5-fpm/configure.sh
@@ -20,28 +20,26 @@ rule adduser log-php5 \
 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}"'
+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 php5-"$pool" \
         --disabled-login \
         --disabled-password \