commit d307ed78bf585e742c5778d80b010ffcc7a5019a
Author: Elan Ruusamäe <[email protected]>
Date: Mon Oct 8 11:07:26 2012 +0300
fix fpm logs. no longer conflict with 5.3 and use existing paths
php-fpm-config.patch | 14 +++++++++++---
php-fpm.logrotate | 5 ++---
php.spec | 9 +++++----
3 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index bbf86d6..d952e43 100644
--- a/php.spec
+++ b/php.spec
@@ -126,7 +126,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%define orgname php
%define php_suffix 54
-%define rel 0.19
+%define rel 0.20
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -2424,13 +2424,14 @@ cp -p sapi/fpm/php-fpm.8
$RPM_BUILD_ROOT%{_mandir}/man8/%{name}-fpm.8
cp -p sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
+install -d $RPM_BUILD_ROOT/etc/logrotate.d
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
+
%{__sed} -i -e '
s#/usr/lib/php#%{php_extensiondir}#
s#/etc/php#%{_sysconfdir}#
s#@processname@#%{name}-fpm#g
-' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
$RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
-install -d $RPM_BUILD_ROOT/etc/logrotate.d
-cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
+'
$RPM_BUILD_ROOT{/etc/{rc.d/init.d/%{name}-fpm,logrotate.d/%{name}-fpm},%{_sysconfdir}/php-fpm.conf}
%endif
# install Embedded API
diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index bf13cc4..779e8cd 100644
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,6 +1,6 @@
---- php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:16:07.304822817 +0300
-+++ php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:19:46.991588712 +0300
-@@ -22,7 +22,7 @@
+--- php-5.4.7/sapi/fpm/php-fpm.conf.in~ 2012-10-05 22:15:59.000000000
+0300
++++ php-5.4.7/sapi/fpm/php-fpm.conf.in 2012-10-05 22:16:44.895998479 +0300
+@@ -22,14 +22,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
@@ -8,7 +8,15 @@
+pid = /var/run/php/@[email protected]
; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; in a local file.
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = log/@[email protected]
+
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
@@ -93,7 +93,7 @@
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
diff --git a/php-fpm.logrotate b/php-fpm.logrotate
index 3bec7c1..694b231 100644
--- a/php-fpm.logrotate
+++ b/php-fpm.logrotate
@@ -1,11 +1,10 @@
-/var/log/fpm.log
-/var/log/fpm-slow.log
+/var/log/@[email protected]
{
notifempty
missingok
create 600 root root
sharedscripts
postrotate
- /sbin/service php-fpm flush-logs > /dev/null
+ /sbin/service @processname@ flush-logs > /dev/null
endscript
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/d307ed78bf585e742c5778d80b010ffcc7a5019a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
