summarylogtreecommitdiffstats
path: root/php-fpm.patch
diff options
context:
space:
mode:
authorEugene Lamskoy2019-03-20 14:03:08 +0200
committerEugene Lamskoy2019-03-20 14:03:08 +0200
commit073991134b602f6bb2d52325e944734ec637dfd7 (patch)
tree3cd2f44cbc4af0459063ce457d59a823bab64889 /php-fpm.patch
parentfd7f500a77186ccc250e3e8a2444ddf05078eaeb (diff)
downloadaur-073991134b602f6bb2d52325e944734ec637dfd7.tar.gz
7.2.16 and fpm/sodium fixes
Diffstat (limited to 'php-fpm.patch')
-rw-r--r--php-fpm.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/php-fpm.patch b/php-fpm.patch
index f13521b76ff..3e4ca06cc15 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -9,7 +9,7 @@
+ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
+ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
fi
-
+
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
--- sapi/fpm/php-fpm.conf.in.orig
+++ sapi/fpm/php-fpm.conf.in
@@ -18,8 +18,8 @@
; 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/php72-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,8 +37,8 @@
; '/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/php72-fpm/php-fpm.sock
+
; Set listen(2) backlog.
; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -44,8 +44,8 @@
@@ -58,17 +58,18 @@
; Default Value: current directory or / when chroot
-;chdir = /var/www
+;chdir = /srv/http
-
+
; 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.
--- sapi/fpm/php-fpm.service.in.orig
+++ sapi/fpm/php-fpm.service.in
@@ -8,7 +8,7 @@
-
+
[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/php72-fpm/php-fpm.pid
++ExecStart=@EXPANDED_SBINDIR@/php-fpm72 --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
ExecReload=/bin/kill -USR2 $MAINPID
PrivateTmp=true