split fpm config to two parts

[glensc]

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

as i understand from bug report comments, currently "lowest version" is master, so this PR is against master branch

[remicollet]

This is already used in some downstream distribution (like Fedora / RHEL / CentOS)
I will prefer /etc/php-fpm.d
And at least a new unit test should be added (lot of have be recently added because lack of covereage for this SAPI)

[glensc]

the path can be made configurable with @fpm_conf_d_dir@ or similar, it's not a problem. thanks for taking interest!

[glensc]

but what kind of test would you expect from config split? tests don't use installed configs, but their own.

[glensc]

looks like it can be set like:

./php-fpm.conf.in:125:include=@php_fpm_sysconfdir@/php-fpm.d/*.conf

that should expand to: /etc/php-fpm.d on your system. is that ok @remicollet?

[remicollet]

that should expand to: /etc/php-fpm.d on your system. is that ok @remicollet?

IMHO opinion, yes (but I'm not the only one which can say something)

but what kind of test would you expect from config split? tests don't use installed configs, but their own.

Forget, I already add a test for splitted configuration (to check load order after PR 906 , bug 68391)

[smalyshev]

Needs rebase

[glensc]

@smalyshev of course it does, this patch is against master branch!

do you approve this change and intend to merge? because rebasing such PR each time someone makes a change is very annoying, because i would need to manually redo whole file splitting again.

i would rebase it just before final merge.

[smalyshev]

@glensc I'm fine with it but I'd like one of FPM maintainers to sign off also, since I don't know enough FPM.

[glensc]

@smalyshev can you ping them?

[remicollet]

Please rebase, I think there is no other configuration change pending.

[glensc]

rebased once again.

[remicollet]

Patch looks fine, and works.

2 minor cosmetic hanges

• please rename php-fpm.conf-d.in (ugly name imho) to www.conf.in
• as you add the "glob / include" at the end (under pool definition), I think it will make sense to drop it from the beginning of php-fpm.conf.in, to keep only one (and only 1 include is currently allowed, see 68022)

[remicollet]

Good catch in 4357e32
But this one have to go in 5.6
But this will mean another rebase... sorry...

[remicollet]

Sorry. http://git.php.net/?p=php-src.git;a=commitdiff;h=505adabf2544d07207274f524281428d83fc7f6e

[glensc]

aside, current the configs are installed with .default extension, and none installed at all with base extension, meaning by default there's no working config, end user has to rename two files

so, imho
(in another pr after this gets merged), should copy foo.conf.default to foo.conf if foo.conf does not exist. or make the config install more rpm-like: install foo.conf if no such exist, otherwise use foo.conf.default

[glensc]

i had the "include" directive once in first version patch (moved to the bottom), but with the flood of rebases, seems it got lost or i thought differently.

[glensc]

rebased again

[php-pulls]

Comment on behalf of remi at php.net:

merged

[glensc]

wohoo!