Skip to content

Commit 9f189dd

Browse files
glenscremicollet
authored andcommitted
split fpm config to two parts. PR#903
main config = global options secondary config = pool options makes easier to add new pools: duplicate pool config in fpm.d dir https://bugs.php.net/bug.php?id=67106
1 parent 70c141b commit 9f189dd

File tree

4 files changed

+423
-423
lines changed

4 files changed

+423
-423
lines changed

sapi/fpm/Makefile.frag

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ install-fpm: $(SAPI_FPM_PATH)
1111
@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
1212

1313
@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
14-
$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
14+
$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
1515
@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
16+
@$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
1617

1718
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
1819
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

sapi/fpm/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ if test "$PHP_FPM" != "no"; then
667667

668668
PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
669669
PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
670-
PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
670+
PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
671671
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
672672

673673
SAPI_FPM_PATH=sapi/fpm/php-fpm

0 commit comments

Comments
 (0)