* php-cgi: Set the proper permissions and path for the socket.

php-cgi

@@ -41,13 +41,13 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/php-cgi
-NAME=php-fcgi
+NAME=php-cgi
 DESC=FastCGI
 
 test -x $DAEMON || exit 0
 
 ## Whether the php cgi daemon should receive incoming requests using
-## Unix sockets or Internet Sockets. The default is Internet sockets.
+## UNIX sockets or Internet Sockets. The default is Internet sockets.
 ## Include php-cgi defaults if available.
 if [ -f /etc/default/php-cgi ] ; then
     . /etc/default/php-cgi
@@ -57,30 +57,32 @@ fi
 
 ## The user the process will run under. 
 USER=www-data
+GROUP=www-data
 
 ## FastCGI specific parameters.
 PHP_FCGI_CHILDREN=15
 PHP_FCGI_MAX_REQUESTS=1000
 
 ## The arguments to pass to the php cgi program.
-DAEMON_OPTIONS="- USER=$USER PATH=/usr/bin PHP_FCGI_CHILDREN=$PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=$PHP_FCGI_MAX_REQUESTS"
+DAEMON_OPTIONS="- USER=$USER GROUP=$GROUP PATH=/usr/bin PHP_FCGI_CHILDREN=$PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=$PHP_FCGI_MAX_REQUESTS"
 
 set -e
 
-## Using Unix sockets or not. Set the binding.
-if [[ $USE_UNIX == "1" ]]; then
-    BIND="/var/run/php-cgi.socket"
+## Using UNIX sockets or not. Set the binding.
+if [ $USE_UNIX == "1" ]; then
+    SOCKET_DIR=/tmp/php-cgi
+    mkdir -p $SOCKET_DIR
+    chown $USER:$GROUP $SOCKET_DIR
+    chmod 700 $SOCKET_DIR
+    BIND="$SOCKET_DIR/php-cgi.socket"
 else
     BIND=127.0.0.1:9000
 fi
 
-## Setting the binding of the php cgi daemon.
-DAEMON_OPTIONS="$DAEMON_OPTIONS -b $BIND"
-
 case "$1" in
     start)
       echo -n "Starting $DESC: "
-      start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $DAEMON $DAEMON_OPTIONS
+      start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- $DAEMON_OPTIONS $DAEMON -b $BIND
       echo "$NAME."
       ;;
     stop)