diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/Makefile.frag php-7.0.33/sapi/fpm/Makefile.frag --- php-7.0.33.org/sapi/fpm/Makefile.frag 2018-12-04 18:23:02.000000000 +0100 +++ php-7.0.33/sapi/fpm/Makefile.frag 2021-08-23 23:36:26.265257286 +0200 @@ -14,9 +14,9 @@ install-fpm: $(SAPI_FPM_PATH) echo "Installing PHP FPM defconfig: skipping"; \ 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; \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \ + $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \ + $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \ fi @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/php-fpm.conf.in php-7.0.33/sapi/fpm/php-fpm.conf.in --- php-7.0.33.org/sapi/fpm/php-fpm.conf.in 2018-12-04 18:23:01.000000000 +0100 +++ php-7.0.33/sapi/fpm/php-fpm.conf.in 2021-08-23 23:36:26.265257286 +0200 @@ -14,14 +14,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid +pid = /var/run/@processname@.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written ; in a local file. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: log/php-fpm.log -;error_log = log/php-fpm.log +error_log = /var/log/php/@processname@.log ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/status.html.in php-7.0.33/sapi/fpm/status.html.in --- php-7.0.33.org/sapi/fpm/status.html.in 2018-12-04 18:23:02.000000000 +0100 +++ php-7.0.33/sapi/fpm/status.html.in 2021-08-23 23:36:26.265257286 +0200 @@ -96,7 +96,7 @@ var sort_index; var sort_order; - doc_url.value = location.protocol + '//' + location.host + "/status?json&full"; + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full"; ths = document.getElementsByTagName("th"); for (var i=0; i