socket path must depend on pool config
Merge branch 'systemd/php-fpm' into refs/top-bases/systemd/marc

* systemd/php-fpm:
  socket path must depend on pool config
Merge commit 'refs/top-bases/systemd/marc' into systemd/marc

* commit 'refs/top-bases/systemd/marc':
  socket path must depend on pool config
replace manualNixMachines by etcFilesProvidedByAdmin

Then you can also maintain other etc files such /etc/hosts yourself.
Merge branch 'submit/manual-etc-hosts' into systemd/marc

* submit/manual-etc-hosts:
  replace manualNixMachines by etcFilesProvidedByAdmin
Revert "add option allowing to maintain /etc/hosts manually. Rebuilding nixos takes much time"

This reverts commit 24fa0f19bca870e8c4dec276871a5857d2c4b7dc.

(see etcFilesProvidedByAdmin)