summarylogtreecommitdiffstats
path: root/php-fpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-fpm.patch')
-rw-r--r--php-fpm.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/php-fpm.patch b/php-fpm.patch
index f13521b76ff..cd0c495511f 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -13,13 +13,13 @@
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
--- sapi/fpm/php-fpm.conf.in.orig
+++ sapi/fpm/php-fpm.conf.in
-@@ -14,14 +14,14 @@
+@@ -17,14 +17,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
-;pid = run/php-fpm.pid
-+;pid = /opt/php71/run/php-fpm/php-fpm.pid
-
++;pid = /run/php71-fpm/php-fpm.pid
+
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
; into a local file.
@@ -27,7 +27,7 @@
; Default Value: log/php-fpm.log
-;error_log = log/php-fpm.log
+error_log = syslog
-
+
; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities
--- sapi/fpm/www.conf.in.orig
@@ -37,7 +37,7 @@
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
-+listen = /opt/php71/run/php-fpm/php-fpm.sock
++listen = /run/php70-fpm/php-fpm.sock
; Set listen(2) backlog.
; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -52,7 +52,7 @@
;listen.mode = 0660
; When POSIX Access Control Lists are supported you can set them using
; these options, value is a comma separated list of user/group names.
-@@ -356,7 +356,7 @@
+@@ -352,7 +352,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
@@ -63,12 +63,14 @@
; stderr will be redirected to /dev/null according to FastCGI specs.
--- sapi/fpm/php-fpm.service.in.orig
+++ sapi/fpm/php-fpm.service.in
-@@ -8,7 +8,7 @@
+@@ -4,8 +4,8 @@
[Service]
Type=@php_fpm_systemd@
-PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
-+PIDFile=/opt/php71/run/php-fpm/php-fpm.pid
- ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
+-ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
++PIDFile=/run/php71-fpm/php-fpm.pid
++ExecStart=@sbindir@/php-fpm71 --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf
ExecReload=/bin/kill -USR2 $MAINPID
- PrivateTmp=true
+
+ [Install]