packages: php/php-fpm-config.patch, php/php.spec - package php-fpm status h...

[glen]

Author: glen                         Date: Thu Jan 12 08:27:19 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package php-fpm status html (uses json response via ajax to update)

---- Files affected:
packages/php:
   php-fpm-config.patch (1.13 -> 1.14) , php.spec (1.971 -> 1.972) 

---- Diffs:

================================================================
Index: packages/php/php-fpm-config.patch
diff -u packages/php/php-fpm-config.patch:1.13 packages/php/php-fpm-config.patch:1.14
--- packages/php/php-fpm-config.patch:1.13	Wed Jan 11 21:05:04 2012
+++ packages/php/php-fpm-config.patch	Thu Jan 12 09:27:14 2012
@@ -60,3 +60,25 @@
  ;env[TMP] = /tmp
  ;env[TMPDIR] = /tmp
  ;env[TEMP] = /tmp
+--- php-5.3.9/sapi/fpm/status.html.in~	2011-10-08 23:43:12.000000000 +0300
++++ php-5.3.9/sapi/fpm/status.html.in	2012-01-12 02:19:09.573191879 +0200
+@@ -96,7 +96,7 @@
+ 			var sort_index;
+ 			var sort_order;
+ 
+-			doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
++			doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
+ 
+ 			ths = document.getElementsByTagName("th");
+ 			for (var i=0; i<ths.length; i++) {
+--- php-5.3.9/sapi/fpm/Makefile.frag~	2012-01-11 21:49:42.000000000 +0200
++++ php-5.3.9/sapi/fpm/Makefile.frag	2012-01-12 02:20:25.553355153 +0200
+@@ -21,7 +21,7 @@
+ 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
+ 
+-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
++	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
+ 
+ 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.971 packages/php/php.spec:1.972
--- packages/php/php.spec:1.971	Wed Jan 11 21:55:34 2012
+++ packages/php/php.spec	Thu Jan 12 09:27:14 2012
@@ -2403,11 +2403,10 @@
 
 # install FCGI PM
 %if %{with fpm}
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}}
-libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}
-cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8
-cp -p sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+%{__make} -f Makefile.fpm install-fpm \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/fpm.d}
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
 cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/php-fpm
@@ -2859,6 +2858,8 @@
 %{_mandir}/man8/php-fpm.8*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm
 %attr(754,root,root) /etc/rc.d/init.d/php-fpm
+%dir %{_datadir}/fpm
+%{_datadir}/fpm/status.html
 %endif
 
 %files common
@@ -3325,6 +3326,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.972  2012/01/12 08:27:14  glen
+- package php-fpm status html (uses json response via ajax to update)
+
 Revision 1.971  2012/01/11 20:55:34  glen
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm-config.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.971&r2=1.972&f=u