--- sapi/fpm/Makefile.frag.orig +++ sapi/fpm/Makefile.frag @@ -15,8 +15,8 @@ else \ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ - $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ - $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ + $(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 @@ -14,14 +14,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid +;pid = /run/php-fpm-legacy/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. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; 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 +++ sapi/fpm/www.conf.in @@ -38,7 +38,7 @@ ; (IPv6 and IPv4-mapped) 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 +listen = /run/php-fpm-legacy/php-fpm.sock ; Set listen(2) backlog. ; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) @@ -50,8 +50,8 @@ ; and group can be specified either by name or by their numeric IDs. ; Default Values: Owner is set to the master process running user. If the group ; is not set, the owner's group is used. Mode is set to 0660. -;listen.owner = @php_fpm_user@ -;listen.group = @php_fpm_group@ +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ ;listen.mode = 0660 ; When POSIX Access Control Lists are supported you can set them using @@ -422,7 +422,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; 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,8 +8,8 @@ [Service] Type=@php_fpm_systemd@ -PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid -ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf +PIDFile=/run/php-fpm-legacy/php-fpm.pid +ExecStart=@EXPANDED_SBINDIR@/php-fpm-legacy --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf ExecReload=/bin/kill -USR2 $MAINPID # Set up a new file system namespace and mounts private /tmp and /var/tmp directories