script/apache2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error (and output) if more than one unix sockets for a certain php version exist.

Browse Source
This commit is contained in:
Christoph
2018-01-07 17:32:01 +01:00
parent 54aa3faab5
commit 59f6f44a9f
1 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
create_vhost.sh
View File

@@ -1700,19 +1700,53 @@ if [ "$_type" = "PHP-FPM" ]; then
if [ "$connection" == "unix_socket" ]; then
if [ "X$unix_socket" = "X" ] ; then
_unix_socket=`ls /tmp/php-${major_php_verison}*.sock 2>/dev/null`
_unix_socket_arr=();
if [[ "$(wc -w <<< "$_unix_socket")" -gt 1 ]]; then
for _socket in ${_unix_socket} ; do
_unix_socket_arr+=("$_socket")
done
fi
echo ""
echo -e "\033[32m--\033[m"
echo ""
echo ""
echo "Where to find the unix php-fpm socket.."
if [[ ${#_unix_socket_arr[@]} -gt 1 ]]; then
echo ""
for _socket in ${_unix_socket} ; do
echo " $_socket"
done
_unix_socket=""
fi
echo ""
echo ""
unix_socket=
if [[ -z $_unix_socket ]] ; then
while [ "X$unix_socket" = "X" ] ; do
echononl "Unix PHP-FPM socket: "
read unix_socket
if [ "X$unix_socket" = "X" ]; then
echo -e "\n\t\033[1;33mUnix Socket is required. Try again..\033[m\n"
continue
fi
if [ ! -S "$unix_socket" ]; then
echo -e "\n\t\033[1;33mNo Unix Socket found at \"unix_socket\"! Try again..\033[m\n"
unix_socket=""
fi
done
else
while [ "X$unix_socket" = "X" ] ; do
echononl "Unix PHP-FPM socket [$_unix_socket]: "
read unix_socket
if [ "X$unix_socket" = "X" ]; then
unix_socket=$_unix_socket
fi
@@ -1721,13 +1755,14 @@ if [ "$_type" = "PHP-FPM" ]; then
unix_socket=""
fi
done
fi
else
echo -e "\033[21G\033[32mUsing Unix Socket \033[m\"$unix_socket\""
fi
tcp_host=127.0.0.1
tcp_port=9000
_proxy_match="^/(.*\.php(/.*)?)\$ unix:$_unix_socket|fcgi://$tcp_host:$tcp_port$_doc_root"
_set_handler_fpm="\"proxy:unix:$_unix_socket|fcgi://$tcp_host\""
_proxy_match="^/(.*\.php(/.*)?)\$ unix:$unix_socket|fcgi://$tcp_host:$tcp_port$_doc_root"
_set_handler_fpm="\"proxy:unix:$unix_socket|fcgi://$tcp_host\""
else
echo ""
echo ""