php: update php-fpm to php_fpm to match port

include/php.sh

@@ -86,7 +86,7 @@ configure_php_fpm() {
 	fi
 
 	sed -i.bak \
-		-e "/^listen =/      s/= .*/= '\/tmp\/php-cgi.socket';/" \
+		-e "/^listen =/      s|= .*|= '/tmp/php-cgi.socket';|" \
 		-e '/^;listen.owner/ s/^;//' \
 		-e '/^;listen.group/ s/^;//' \
 		-e '/^;listen.mode/  s/^;//' \
@@ -103,18 +103,19 @@ start_php_fpm()
 {
 	tell_status "starting PHP FPM"
 	stage_sysrc php_fpm_enable=YES
-	stage_exec service php-fpm start || stage_exec service php-fpm restart
+	stage_exec service php_fpm start || stage_exec service php_fpm restart
 }
 
 test_php_fpm()
 {
 	tell_status "testing PHP FPM (FastCGI Process Manager) is running"
 	stage_test_running php-fpm
 
-	tell_status "testing PHP FPM is listening"
 	if [ "$PHP_LISTEN_MODE" = "tcp" ]; then
+		tell_status "testing PHP FPM is listening"
 		stage_listening 9000
 	else
+		tell_status "testing PHP FPM socket exists"
 		if [ ! -S "$STAGE_MNT/tmp/php-cgi.socket" ]; then
 			echo "no PHP-FPM socket found!"
 			exit

provision/mailman.sh

@@ -49,13 +49,14 @@ configure_mailman()
 {
 	configure_opendkim
 	configure_postfix
-	
+
 	tell_status "configuring mailman"
 	stage_sysrc mailman_enable=YES
 	stage_sysrc nginx_enable=YES
 	stage_sysrc uwsgi_enable=YES
 	stage_sysrc uwsgi_socket_owner="www:mailman"
 	stage_sysrc fcgiwrap_enable=YES
+	stage_sysrc fcgiwrap_socket=unix:/var/run/fcgiwrap/fcgiwrap.sock
 	stage_sysrc fcgiwrap_socket_owner=www
 
 	_mm_etc="usr/local/mailman/etc"

provision/nagios.sh

@@ -67,6 +67,7 @@ configure_fcgiwrap()
 	stage_sysrc fcgiwrap_enable="YES"
 	stage_sysrc fcgiwrap_user="www"
 	stage_sysrc fcgiwrap_group="www"
+	stage_sysrc fcgiwrap_socket="unix:/var/run/fcgiwrap/fcgiwrap.sock"
 	stage_sysrc fcgiwrap_socket_owner="www"
 	stage_sysrc fcgiwrap_socket_group="www"
 }