Fix error (and output) if more than one unix sockets for a certain php version exist.
This commit is contained in:
		| @@ -1700,34 +1700,69 @@ if [ "$_type" = "PHP-FPM" ]; then | |||||||
|    if [ "$connection" == "unix_socket" ]; then |    if [ "$connection" == "unix_socket" ]; then | ||||||
|  |  | ||||||
|       if [ "X$unix_socket" = "X" ] ; then |       if [ "X$unix_socket" = "X" ] ; then | ||||||
|  |  | ||||||
|          _unix_socket=`ls /tmp/php-${major_php_verison}*.sock 2>/dev/null` |          _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 "" | ||||||
|          echo -e "\033[32m--\033[m" |          echo -e "\033[32m--\033[m" | ||||||
|          echo "" |          echo "" | ||||||
|          echo "" |          echo "" | ||||||
|          echo "Where to find the unix php-fpm socket.." |          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 "" | ||||||
|          echo "" |          echo "" | ||||||
|          unix_socket= |          unix_socket= | ||||||
|          while [ "X$unix_socket" = "X" ] ; do |          if [[ -z $_unix_socket ]] ; then | ||||||
|             echononl "Unix PHP-FPM socket [$_unix_socket]: " |             while [ "X$unix_socket" = "X" ] ; do | ||||||
|             read unix_socket |                echononl "Unix PHP-FPM socket: " | ||||||
|             if [ "X$unix_socket" = "X" ]; then |                read unix_socket | ||||||
|                unix_socket=$_unix_socket |  | ||||||
|             fi |                if [ "X$unix_socket" = "X" ]; then | ||||||
|             if [ ! -S "$unix_socket" ]; then |                   echo -e "\n\t\033[1;33mUnix Socket is required. Try again..\033[m\n" | ||||||
|                echo -e "\n\t\033[1;33mNo Unix Socket found at \"unix_socket\"! Try again..\033[m\n" |                   continue | ||||||
|                unix_socket="" |                fi | ||||||
|             fi |                if [ ! -S "$unix_socket" ]; then | ||||||
|          done |                   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 | ||||||
|  |                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 | ||||||
|  |          fi | ||||||
|       else |       else | ||||||
|          echo -e "\033[21G\033[32mUsing Unix Socket \033[m\"$unix_socket\"" |          echo -e "\033[21G\033[32mUsing Unix Socket \033[m\"$unix_socket\"" | ||||||
|       fi |       fi | ||||||
|       tcp_host=127.0.0.1 |       tcp_host=127.0.0.1 | ||||||
|       tcp_port=9000 |       tcp_port=9000 | ||||||
|       _proxy_match="^/(.*\.php(/.*)?)\$ unix:$_unix_socket|fcgi://$tcp_host:$tcp_port$_doc_root" |       _proxy_match="^/(.*\.php(/.*)?)\$ unix:$unix_socket|fcgi://$tcp_host:$tcp_port$_doc_root" | ||||||
|       _set_handler_fpm="\"proxy:unix:$_unix_socket|fcgi://$tcp_host\"" |       _set_handler_fpm="\"proxy:unix:$unix_socket|fcgi://$tcp_host\"" | ||||||
|    else |    else | ||||||
|       echo "" |       echo "" | ||||||
|       echo "" |       echo "" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user