main/php: APKBUILD and php-fpm.initd cleanups

- fix arch=noarch for php, php-common, php-pear
- php-fpm and php-apache2 package code moved from main to related subpackages
- clean init script for php-fpm

1 files changed, 12 insertions, 25 deletions

diff --git a/main/php/php-fpm.initd b/main/php/php-fpm.initd
index a7e6798087..814c2bb264 100644
--- a/main/php/php-fpm.initd
+++ b/main/php/php-fpm.initd
@@ -1,10 +1,12 @@
 #!/sbin/openrc-run
 
-PHP_FPM_CONF="/etc/php/php-fpm.conf"
+name="PHP FastCGI Process Manager"
+cfgfile="/etc/php/php-fpm.conf"
 pidfile="/var/run/php-fpm.pid"
-command=/usr/bin/php-fpm
+command="/usr/bin/php-fpm"
+command_args="--fpm-config $cfgfile --pid $pidfile"
+required_files="$cfgfile"
 
-extra_commands="depend"
 extra_started_commands="reload"
 
 depend() {
@@ -12,29 +14,14 @@ depend() {
 	use apache2 lighttpd nginx
 }
 
-start() {
-        ebegin "Starting PHP FastCGI Process Manager"
-        start-stop-daemon --start --pidfile ${pidfile} --exec ${command} \
-            -- --fpm-config "${PHP_FPM_CONF}" --pid "${pidfile}"
-        local i=0
-        local timeout=50
-        while [ ! -f ${pidfile} ] && [ $i -le $timeout ]; do
-            sleep 0.1
-            i=$(($i + 1))
-        done
-
-        [ $timeout -gt $i ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping PHP FastCGI Process Manager"
-        start-stop-daemon --signal QUIT --stop --pidfile ${pidfile}
-        eend $?
+start_pre() {
+	ebegin
+	$command $command_args -t 2>/dev/null
+	eend $?
 }
 
 reload() {
-    ebegin "Reloading PHP FastCGI Process Manager"
-    [ -f ${pidfile} ] && kill -USR2 $(cat ${pidfile})
-    eend $?
+	ebegin "Reloading $name"
+	start-stop-daemon --signal USR2 --pidfile ${pidfile} --name ${SVCNAME}
+	eend $?
 }