From f9d3d476dfc68ea01cbf726879219477f4dcf66e Mon Sep 17 00:00:00 2001 From: remi Date: Sun, 10 Oct 2010 20:19:10 +0200 Subject: [PATCH] enable php-fpm sub-package --- php-fpm-www.conf | 213 ++++++++++++++++++++++++++++++++++++++++++++++ php-fpm.conf | 60 +++++++++++++ php-fpm.init | 85 ++++++++++++++++++ php-fpm.logrotate | 9 ++ php.spec | 90 +++++++++++++++++++- 5 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 php-fpm-www.conf create mode 100644 php-fpm.conf create mode 100755 php-fpm.init create mode 100644 php-fpm.logrotate diff --git a/php-fpm-www.conf b/php-fpm-www.conf new file mode 100644 index 0000000..81fca85 --- /dev/null +++ b/php-fpm-www.conf @@ -0,0 +1,213 @@ +; Start a new pool named 'www'. +[www] + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: -1 +;listen.backlog = -1 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +listen.allowed_clients = 127.0.0.1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0666 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +; RPM: apache Choosed to be able to access some dir as httpd +user = apache +; RPM: Keep a group allowed to write in log dir. +group = apache + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 50 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 5 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 35 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +slowlog = /var/log/php-fpm/www-slow.log + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. This value must be an absolute path. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +php_admin_value[error_log] = /var/log/php-fpm/www-error.log +php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/php-fpm.conf b/php-fpm.conf new file mode 100644 index 0000000..a243fa0 --- /dev/null +++ b/php-fpm.conf @@ -0,0 +1,60 @@ +;;;;;;;;;;;;;;;;;;;;; +; FPM Configuration ; +;;;;;;;;;;;;;;;;;;;;; + +; All relative paths in this configuration file are relative to PHP's install +; prefix. + +; Include one or more files. If glob(3) exists, it is used to include a bunch of +; files from a glob(3) pattern. This directive can be used everywhere in the +; file. +include=/etc/php-fpm.d/*.conf + +;;;;;;;;;;;;;;;;;; +; Global Options ; +;;;;;;;;;;;;;;;;;; + +[global] +; Pid file +; Default Value: none +pid = /var/run/php-fpm/php-fpm.pid + +; Error log file +; Default Value: /var/log/php-fpm.log +error_log = /var/log/php-fpm/error.log + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +;log_level = notice + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +;emergency_restart_threshold = 0 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;emergency_restart_interval = 0 + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;process_control_timeout = 0 + +; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. +; Default Value: yes +;daemonize = yes + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; See /etc/php-fpm.d/*.conf + diff --git a/php-fpm.init b/php-fpm.init new file mode 100755 index 0000000..a6375ba --- /dev/null +++ b/php-fpm.init @@ -0,0 +1,85 @@ +#! /bin/sh +# +# chkconfig: - 84 16 +# description: PHP FastCGI Process Manager +# processname: php-fpm +# config: /etc/php-fpm.conf +# pidfile: /var/run/php-fpm/php-fpm.pid + +# Standard LSB functions +#. /lib/lsb/init-functions + +# Source function library. +. /etc/init.d/functions + +# Check that networking is up. +. /etc/sysconfig/network + +if [ "$NETWORKING" = "no" ] +then + exit 0 +fi + +RETVAL=0 +prog="php-fpm" +pidfile=${PIDFILE-/var/run/php-fpm/php-fpm.pid} +lockfile=${LOCKFILE-/var/lock/subsys/php-fpm} + +start () { + echo -n $"Starting $prog: " + daemon --pidfile ${pidfile} php-fpm + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch ${lockfile} +} +stop () { + echo -n $"Stopping $prog: " + killproc -p ${pidfile} php-fpm + RETVAL=$? + echo + if [ $RETVAL -eq 0 ] ; then + rm -f ${lockfile} ${pidfile} + fi +} + +restart () { + stop + start +} + +reload () { + echo -n $"Reloading $prog: " + killproc -p ${pidfile} php-fpm -USR2 + RETVAL=$? + echo +} + + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p ${pidfile} php-fpm + RETVAL=$? + ;; + restart) + restart + ;; + reload|force-reload) + reload + ;; + condrestart|try-restart) + [ -f ${lockfile} ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|try-restart}" + RETVAL=2 + ;; +esac + +exit $RETVAL diff --git a/php-fpm.logrotate b/php-fpm.logrotate new file mode 100644 index 0000000..a8cfbc8 --- /dev/null +++ b/php-fpm.logrotate @@ -0,0 +1,9 @@ +/var/log/php-fpm/*log { + missingok + notifempty + sharedscripts + delaycompress + postrotate + /bin/kill -SIGUSR1 `cat /var/run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/php.spec b/php.spec index 6003e4d..8ba0873 100644 --- a/php.spec +++ b/php.spec @@ -14,10 +14,16 @@ # Regression tests take a long time, you can skip 'em with this %{!?runselftest: %{expand: %%global runselftest 1}} +%ifarch %{ix86} x86_64 +%global with_fpm 1 +%else +%global with_fpm 0 +%endif + Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -26,6 +32,10 @@ Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.conf Source2: php.ini Source3: macros.php +Source4: php-fpm.conf +Source5: php-fpm-www.conf +Source6: php-fpm.init +Source7: php-fpm.logrotate # Build fixes Patch1: php-5.3.3-gnusrc.patch @@ -98,6 +108,19 @@ BuildRequires: libtool-ltdl-devel The php-zts package contains a module for use with the Apache HTTP Server which can operate under a threaded server processing model. +%if %{with_fpm} +%package fpm +Group: Development/Languages +Summary: PHP FastCGI Process Manager +Requires: php-common = %{version}-%{release} +BuildRequires: libevent-devel >= 1.4.11 + +%description fpm +PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI +implementation with some additional features useful for sites of +any size, especially busier sites. +%endif + %package common Group: Development/Languages Summary: Common files for PHP @@ -450,7 +473,10 @@ cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT cp ext/gd/libgd/README gd_README # Multiple builds for multiple SAPIs -mkdir build-cgi build-apache build-embedded build-zts +mkdir build-cgi build-apache build-embedded build-zts \ +%if %{with_fpm} + build-fpm +%endif # Remove bogus test; position of read position after fopen(, "a+") # is not defined by C standard, so don't presume anything. @@ -655,6 +681,13 @@ pushd build-apache build --with-apxs2=%{_sbindir}/apxs ${without_shared} popd +%if %{with_fpm} +# Build php-fpm +pushd build-fpm +build --enable-fpm ${without_shared} +popd +%endif + # Build for inclusion as embedded script language into applications, # /usr/lib[64]/libphp5.so pushd build-embedded @@ -697,6 +730,11 @@ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ # Install the version for embedded script language in applications + php_embed.h make -C build-embedded install-sapi install-headers INSTALL_ROOT=$RPM_BUILD_ROOT +%if %{with_fpm} +# Install the php-fpm binary +make -C build-fpm install-fpm INSTALL_ROOT=$RPM_BUILD_ROOT +%endif + # Install everything from the CGI SAPI build make -C build-cgi install INSTALL_ROOT=$RPM_BUILD_ROOT @@ -726,6 +764,24 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/php/session +%if %{with_fpm} +# PHP-FPM stuff +# Log +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/php-fpm +install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/run/php-fpm +# Config +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d +install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf +mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default . +# Service +install -m 755 -d $RPM_BUILD_ROOT%{_initrddir} +install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_initrddir}/php-fpm +# LogRotate +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm +%endif + # Fix the link (cd $RPM_BUILD_ROOT%{_bindir}; ln -sfn phar.phar phar) @@ -790,6 +846,17 @@ rm -f README.{Zeus,QNX,CVS-RULES} [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT rm files.* macros.php +%if %{with_fpm} +%post fpm +/sbin/chkconfig --add php-fpm + +%preun fpm +if [ "$1" = 0 ] ; then + /sbin/service php-fpm stop >/dev/null 2>&1 + /sbin/chkconfig --del php-fpm +fi +%endif + %post embedded -p /sbin/ldconfig %postun embedded -p /sbin/ldconfig @@ -828,6 +895,22 @@ rm files.* macros.php %defattr(-,root,root) %{_libdir}/httpd/modules/libphp5-zts.so +%if %{with_fpm} +%files fpm +%defattr(-,root,root) +%doc php-fpm.conf.default +%config(noreplace) %{_sysconfdir}/php-fpm.conf +%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm +%{_sbindir}/php-fpm +%{_initrddir}/php-fpm +%dir %{_sysconfdir}/php-fpm.d +# log owned by apache for log +%attr(770,apache,apache) %dir %{_localstatedir}/log/php-fpm +%dir %{_localstatedir}/run/php-fpm +%{_mandir}/man1/php-fpm.1* +%endif + %files devel %defattr(-,root,root) %{_bindir}/php-config @@ -870,6 +953,9 @@ rm files.* macros.php %files enchant -f files.enchant %changelog +* Sun Oct 10 2010 Remi Collet 5.3.3-2 +- add php-fpm sub-package + * Thu Jul 22 2010 Remi Collet 5.3.3-1 - PHP 5.3.3 released