Skip to content

Commit f8890e0

Browse files
committed
Rename default php-fpm.sock to php-fpm_www.sock`
1 parent afd6d02 commit f8890e0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ for PHP_MILESTONE in "${PHP_MILESTONES[@]}"; do
241241
done
242242

243243
setup_dangling_alternatives "$CONTAINER" \
244-
"/run/php-fpm/php-fpm.sock" "php-fpm.sock" "/run/php-fpm/%s/php-fpm_www.sock" \
244+
"/run/php-fpm/php-fpm_www.sock" "php-fpm_www.sock" "/run/php-fpm/%s/php-fpm_www.sock" \
245245
"$PHP_LATEST_MILESTONE" "${PHP_MILESTONES[@]}"
246246

247247
cmd buildah run "$CONTAINER" -- \

src/entrypoint.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if [ "$1" == "php-fpm" ]; then
8080
update-alternatives --quiet --set html "/var/www/php$PHP_MILESTONE"
8181
update-alternatives --quiet --set php-fpm "/usr/sbin/php-fpm$PHP_MILESTONE"
8282
[ ! -e "/etc/php/$PHP_MILESTONE/fpm/pool.d/www.conf" ] \
83-
|| update-alternatives --quiet --set php-fpm.sock "/run/php-fpm/$PHP_MILESTONE/php-fpm_www.sock"
83+
|| update-alternatives --quiet --set php-fpm_www.sock "/run/php-fpm/$PHP_MILESTONE/php-fpm_www.sock"
8484

8585
[ -e "/usr/local/bin/pie-php$PHP_MILESTONE" ] \
8686
&& update-alternatives --quiet --set pie "/usr/local/bin/pie-php$PHP_MILESTONE" \
@@ -92,14 +92,14 @@ if [ "$1" == "php-fpm" ]; then
9292
# abbreviate symlinks on container volumes
9393
HTML_TARGET="$(update-alternatives --query html \
9494
| sed -ne 's#^Value: /var/www/\(php[0-9]\.[0-9]\)$#\1#p')"
95-
FPM_SOCKET_TARGET="$(update-alternatives --query php-fpm.sock \
95+
FPM_SOCKET_TARGET="$(update-alternatives --query php-fpm_www.sock \
9696
| sed -ne 's#^Value: /run/php-fpm/\([0-9]\.[0-9]/..*\)$#\1#p')"
9797

9898
rm -f "/var/www/html"
9999
[ -z "$HTML_TARGET" ] || ln -s "$HTML_TARGET/" "/var/www/html"
100100

101-
rm -f "/run/php-fpm/php-fpm.sock"
102-
[ -z "$FPM_SOCKET_TARGET" ] || ln -s "$FPM_SOCKET_TARGET" "/run/php-fpm/php-fpm.sock"
101+
rm -f "/run/php-fpm/php-fpm_www.sock"
102+
[ -z "$FPM_SOCKET_TARGET" ] || ln -s "$FPM_SOCKET_TARGET" "/run/php-fpm/php-fpm_www.sock"
103103

104104
# wait for *any* of the `php-fpm` pools to exit
105105
# i.e., this script quits if one of the `php-fpm` pools quit

0 commit comments

Comments
 (0)