Date: Thursday, May 31, 2012 @ 06:36:35
Author: pierre
Revision: 160224
use /run instead of /var/run; create /run/php-fpm on install if needed
Added:
php/trunk/php-fpm.install
Modified:
php/trunk/PKGBUILD
php/trunk/logrotate.d.php-fpm
php/trunk/php-fpm.conf.in.patch
php/trunk/php-fpm.service
php/trunk/php-fpm.tmpfiles
php/trunk/rc.d.php-fpm
-----------------------+
PKGBUILD | 3 ++-
logrotate.d.php-fpm | 2 +-
php-fpm.conf.in.patch | 4 ++--
php-fpm.install | 9 +++++++++
php-fpm.service | 2 +-
php-fpm.tmpfiles | 2 +-
rc.d.php-fpm | 18 +++++++++---------
7 files changed, 25 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-05-31 10:26:47 UTC (rev 160223)
+++ PKGBUILD 2012-05-31 10:36:35 UTC (rev 160224)
@@ -22,7 +22,7 @@
'php-tidy'
'php-xsl')
pkgver=5.4.3
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -235,6 +235,7 @@
pkgdesc='FastCGI Process Manager for PHP'
depends=('php')
backup=('etc/php/php-fpm.conf')
+ install='php-fpm.install'
install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm
${pkgdir}/usr/sbin/php-fpm
install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8
${pkgdir}/usr/share/man/man8/php-fpm.8
Modified: logrotate.d.php-fpm
===================================================================
--- logrotate.d.php-fpm 2012-05-31 10:26:47 UTC (rev 160223)
+++ logrotate.d.php-fpm 2012-05-31 10:36:35 UTC (rev 160224)
@@ -3,6 +3,6 @@
notifempty
delaycompress
postrotate
- kill -USR1 `cat /var/run/php-fpm/php-fpm.pid 2>/dev/null`
2>/dev/null || true
+ kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null`
2>/dev/null || true
endscript
}
Modified: php-fpm.conf.in.patch
===================================================================
--- php-fpm.conf.in.patch 2012-05-31 10:26:47 UTC (rev 160223)
+++ php-fpm.conf.in.patch 2012-05-31 10:36:35 UTC (rev 160224)
@@ -14,7 +14,7 @@
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
-;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
++pid = /run/php-fpm/php-fpm.pid
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
@@ -24,7 +24,7 @@
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
++listen = /run/php-fpm/php-fpm.sock
; Set listen(2) backlog.
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
Added: php-fpm.install
===================================================================
--- php-fpm.install (rev 0)
+++ php-fpm.install 2012-05-31 10:36:35 UTC (rev 160224)
@@ -0,0 +1,9 @@
+post_install() {
+ if [[ ! -d run/php-fpm ]]; then
+ usr/bin/systemd-tmpfiles --create
usr/lib/tmpfiles.d/php-fpm.conf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Modified: php-fpm.service
===================================================================
--- php-fpm.service 2012-05-31 10:26:47 UTC (rev 160223)
+++ php-fpm.service 2012-05-31 10:36:35 UTC (rev 160224)
@@ -4,7 +4,7 @@
[Service]
Type=forking
-PIDFile=/var/run/php-fpm/php-fpm.pid
+PIDFile=/run/php-fpm/php-fpm.pid
PrivateTmp=true
ExecStart=/usr/sbin/php-fpm
ExecReload=/bin/kill -USR2 $MAINPID
Modified: php-fpm.tmpfiles
===================================================================
--- php-fpm.tmpfiles 2012-05-31 10:26:47 UTC (rev 160223)
+++ php-fpm.tmpfiles 2012-05-31 10:36:35 UTC (rev 160224)
@@ -1 +1 @@
-d /var/run/php-fpm 755 root root
+d /run/php-fpm 755 root root
Modified: rc.d.php-fpm
===================================================================
--- rc.d.php-fpm 2012-05-31 10:26:47 UTC (rev 160223)
+++ rc.d.php-fpm 2012-05-31 10:36:35 UTC (rev 160224)
@@ -64,7 +64,7 @@
exit 1
fi
- wait_for_pid created /var/run/php-fpm/php-fpm.pid
+ wait_for_pid created /run/php-fpm/php-fpm.pid
if [ -n "$try" ] ; then
stat_fail
@@ -79,14 +79,14 @@
test_config
stat_busy 'Gracefully shutting down php-fpm'
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+ if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
stat_fail
exit 1
fi
- kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
+ kill -QUIT `cat /run/php-fpm/php-fpm.pid`
- wait_for_pid removed /var/run/php-fpm.pid
+ wait_for_pid removed /run/php-fpm.pid
if [ -n "$try" ] ; then
stat_fail
@@ -100,14 +100,14 @@
force-quit)
stat_busy 'Terminating php-fpm'
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+ if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
stat_fail
exit 1
fi
- kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
+ kill -TERM `cat /run/php-fpm/php-fpm.pid`
- wait_for_pid removed /var/run/php-fpm/php-fpm.pid
+ wait_for_pid removed /run/php-fpm/php-fpm.pid
if [ -n "$try" ] ; then
stat_fail
@@ -127,12 +127,12 @@
test_config
stat_busy 'Reload service php-fpm'
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+ if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
stat_fail
exit 1
fi
- kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
+ kill -USR2 `cat /run/php-fpm/php-fpm.pid`
stat_done
;;
