projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 8851ace1 ER |
1 | --- php-5.6.2/sapi/fpm/php-fpm.conf.in 2014-10-27 08:20:34.963718145 +0200 |
| 2 | +++ php-5.6.2.old/sapi/fpm/php-fpm.conf.in 2014-10-27 08:07:47.762117299 +0200 | |
| 3 | @@ -14,14 +14,14 @@ | |
| c0240cb1 | 4 | ; Pid file |
| 5 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ | |
| 6 | ; Default Value: none | |
| 7 | -;pid = run/php-fpm.pid | |
| d936e544 | 8 | +pid = /var/run/@processname@.pid |
| c0240cb1 | 9 | |
| 10 | ; Error log file | |
| d307ed78 ER |
11 | ; If it's set to "syslog", log is sent to syslogd instead of being written |
| 12 | ; in a local file. | |
| c0240cb1 | 13 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ |
| d307ed78 ER |
14 | ; Default Value: log/php-fpm.log |
| 15 | -;error_log = log/php-fpm.log | |
| 3263298d | 16 | +error_log = /var/log/php/@processname@.log |
| d307ed78 ER |
17 | |
| 18 | ; syslog_facility is used to specify what type of program is logging the | |
| 19 | ; message. This lets syslogd specify that messages from different facilities | |
| 8851ace1 ER |
20 | @@ -115,3 +115,11 @@ |
| 21 | ; ports and different management options. The name of the pool will be | |
| 22 | ; used in logs and stats. There is no limitation on the number of pools which | |
| 23 | ; FPM can handle. Your system will tell you anyway :) | |
| 24 | + | |
| 25 | +; Include one or more files. If glob(3) exists, it is used to include a bunch of | |
| 26 | +; files from a glob(3) pattern. This directive can be used everywhere in the | |
| 27 | +; file. | |
| 28 | +; Relative path can also be used. They will be prefixed by: | |
| 29 | +; - the global prefix if it's been set (-p argument) | |
| 30 | +; - @prefix@ otherwise | |
| 31 | +include=/etc/php/fpm.d/*.conf | |
| f7b16851 ER |
32 | --- php-5.6.5/sapi/fpm/php-fpm.conf-d.in~ 2015-02-04 19:26:16.000000000 +0200 |
| 33 | +++ php-5.6.5/sapi/fpm/php-fpm.conf-d.in 2015-02-04 19:27:25.275218535 +0200 | |
| 72f7881d | 34 | @@ -32,7 +32,7 @@ |
| c0240cb1 | 35 | ; specific port; |
| 36 | ; '/path/to/unix/socket' - to listen on a unix socket. | |
| 37 | ; Note: This value is mandatory. | |
| 38 | -listen = 127.0.0.1:9000 | |
| cbcd3660 | 39 | +listen = /var/run/php/@processname@.sock |
| c0240cb1 | 40 | |
| 8851ace1 ER |
41 | ; Set listen(2) backlog. |
| 42 | ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) | |
| f7b16851 | 43 | @@ -46,9 +46,9 @@ |
| 72f7881d ER |
44 | ; BSD-derived systems allow connections regardless of permissions. |
| 45 | ; Default Values: user and group are set as the running user | |
| 46 | ; mode is set to 0660 | |
| 47 | -;listen.owner = @php_fpm_user@ | |
| 48 | -;listen.group = @php_fpm_group@ | |
| 49 | -;listen.mode = 0660 | |
| 50 | +listen.owner = root | |
| 51 | +listen.group = @php_fpm_group@ | |
| 52 | +listen.mode = 0660 | |
| f7b16851 ER |
53 | ; When POSIX Access Control Lists are supported you can set them using |
| 54 | ; these options, value is a comma separated list of user/group names. | |
| 55 | ; When set, listen.owner and listen.group are ignored | |
| 72f7881d | 56 | @@ -53,7 +53,7 @@ |
| c0240cb1 | 57 | ; must be separated by a comma. If this value is left blank, connections will be |
| 58 | ; accepted from any ip address. | |
| 59 | ; Default Value: any | |
| 60 | -;listen.allowed_clients = 127.0.0.1 | |
| 61 | +listen.allowed_clients = 127.0.0.1 | |
| 62 | ||
| 8851ace1 ER |
63 | ; Specify the nice(2) priority to apply to the pool processes (only if set) |
| 64 | ; The value can vary from -19 (highest priority) to 20 (lower priority) | |
| 72f7881d | 65 | @@ -372,7 +372,7 @@ |
| c0240cb1 | 66 | ; the current environment. |
| 67 | ; Default Value: clean env | |
| 68 | ;env[HOSTNAME] = $HOSTNAME | |
| 69 | -;env[PATH] = /usr/local/bin:/usr/bin:/bin | |
| 70 | +env[PATH] = $PATH | |
| 71 | ;env[TMP] = /tmp | |
| 72 | ;env[TMPDIR] = /tmp | |
| 73 | ;env[TEMP] = /tmp | |
| 7171db9b ER |
74 | --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300 |
| 75 | +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200 | |
| 76 | @@ -96,7 +96,7 @@ | |
| 77 | var sort_index; | |
| 78 | var sort_order; | |
| 79 | ||
| 80 | - doc_url.value = location.protocol + '//' + location.host + "/status?json&full"; | |
| 81 | + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full"; | |
| 82 | ||
| 83 | ths = document.getElementsByTagName("th"); | |
| 84 | for (var i=0; i<ths.length; i++) { | |
| 8851ace1 ER |
85 | --- php-5.6.2/sapi/fpm/Makefile.frag~ 2014-10-27 08:18:59.000000000 +0200 |
| 86 | +++ php-5.6.2/sapi/fpm/Makefile.frag 2014-10-27 08:19:37.524436179 +0200 | |
| 87 | @@ -12,8 +12,8 @@ | |
| 7171db9b ER |
88 | |
| 89 | @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ | |
| 8851ace1 | 90 | $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || : |
| 7171db9b | 91 | - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : |
| 8851ace1 | 92 | - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf.default || : |
| 7171db9b | 93 | + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || : |
| 8851ace1 | 94 | + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || : |
| 7171db9b ER |
95 | |
| 96 | @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" | |
| 97 | @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 |