Fix commission-php-fpm systemd service

2 files changed, 3 insertions, 78 deletions

diff --git a/usr/lib/systemd/system/commission-php-fpm.service b/usr/lib/systemd/system/commission-php-fpm.service
index 3651747..49ecc0a 100644
--- a/usr/lib/systemd/system/commission-php-fpm.service
+++ b/usr/lib/systemd/system/commission-php-fpm.service
@@ -15,7 +15,9 @@ After=network-online.target commission.service
 
 [Service]
 SyslogIdentifier=PHP-Commissioning
-ExecStart=/usr/libexec/commission/commission-php-fpm
+ExecStart=/usr/sbin/php-fpm --nodaemonize -R --fpm-config /etc/php-fpm-commission.conf
+PIDFILE=/run/php-fpm-commissioning.pid
+SyslogIdentifier=PHP-Commissioning
 Restart=on-failure
 
 [Install]
diff --git a/usr/libexec/commission/commission-php-fpm b/usr/libexec/commission/commission-php-fpm
deleted file mode 100755
index f3a53b4..0000000
--- a/usr/libexec/commission/commission-php-fpm
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          php-fpm
-# Required-Start:    $remote_fs $network
-# Required-Stop:     $remote_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: starts php-fpm
-# Description:       starts the PHP FastCGI Process Manager daemon
-### END INIT INFO
-
-DESC="MT php commissioning server "
-NAME="php-fpm-commission"
-prefix=/usr
-exec_prefix=/usr
-
-php_fpm_BIN=/usr/sbin/php-fpm
-php_fpm_CONF="/etc/${NAME}.conf"
-php_fpm_PID="/var/run/${NAME}.pid"
-
-
-php_opts="-R --fpm-config $php_fpm_CONF --pid $php_fpm_PID"
-ENABLED=yes
-
-wait_for_pid () {
-	try=0
-
-	while test $try -lt 35 ; do
-
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		echo -n .
-		try=`expr $try + 1`
-		sleep 1
-
-	done
-
-}
-
-		[ -f "/run/mt-commission" ] && . "/run/mt-commission"
-		if [[ $ENABLED != "yes" ]]; then
-		  echo "$NAME: disabled in /run/mt-commission"
-		  exit
-		fi
-
-		echo -n "Starting php-fpm "
-
-		$php_fpm_BIN --daemonize $php_opts
-
-		if [ "$?" != 0 ] ; then
-			echo " failed"
-			exit 1
-		fi
-
-		wait_for_pid created $php_fpm_PID
-
-		if [ -n "$try" ] ; then
-			echo " failed"
-			exit 1
-		else
-			echo " done"
-		fi