Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Systemd on-demand socket-based activation #81

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Systemd on-demand socket-based activation #81

wants to merge 19 commits into from

Commits on Sep 1, 2016

  1. Initial systemd socket config 

    * Creates php::fpm::systemd-socket-conf for systemd sockets
* Adds systemd socket and service
* Modified config file templates that allow for multiple php-fpm master
processes.
    @gchaix
    gchaix committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    12f1e8f View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2016

  1. Add pid directory, listen address, cleanup

    @gchaix
    gchaix committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    71c2e78 View commit details
    Browse the repository at this point in the history

  2. Don't start php-fpm-www-systemd.service 

    The socket starts the service as needed.  Enabling it in puppet can
cause a race condition where the service tries to start before the socket
exists.
    @gchaix
    gchaix committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    bbdfb2b View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2016

  1. Ensure services are created and started in the right order

    @gchaix
    gchaix committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    54a2064 View commit details
    Browse the repository at this point in the history

  2. Ensure both service and socket files are in place before starting either

    @gchaix
    gchaix committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    9119977 View commit details
    Browse the repository at this point in the history

  3. Remove duplicate requires

    @gchaix
    gchaix committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    7fc3daf View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2016

  1. Move creation of pid directory to systemd-daemon.pp 

    The PID directory only needs to be created once and including it in the
systemd-socket-conf will attempt to define it multiple times if multiple
pools are defined.  Moving it to a daemon manifest so it only happens
once.
    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    7e86983 View commit details
    Browse the repository at this point in the history

  2. Make names consistent

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    6fbc20b View commit details
    Browse the repository at this point in the history

  3. Clean up whitespace/indent

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    919b088 View commit details
    Browse the repository at this point in the history

  4. Make sure /var/run/php-fpm exists

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    a7dfc9a View commit details
    Browse the repository at this point in the history

  5. Set ${service_path} depending on distribution

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    9e26a89 View commit details
    Browse the repository at this point in the history

  6. Darn closing bracket

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    588badb View commit details
    Browse the repository at this point in the history

  7. Abstraction for osfamily 

    Move systemd service path into params.pp
Add binary to params.pp
Make service template use binary parameter
    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    fb71131 View commit details
    Browse the repository at this point in the history

  8. Differentiate it as the fpm_binary in params

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    e991bd0 View commit details
    Browse the repository at this point in the history

  9. Explicitly set 'systemctl' as the start/stop/status 

    Puppet on Debian wants to call 'service' instead of 'systemctl'.
    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    d648ceb View commit details
    Browse the repository at this point in the history

  10. Make sure php::fpm::systemd-socket-conf knows all params

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    7910ebc View commit details
    Browse the repository at this point in the history

  11. Set $fpm_pool_dir in template

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    27a20c6 View commit details
    Browse the repository at this point in the history

  12. Fix fpm_pool_dir in template

    @gchaix
    gchaix committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    b69c66f View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2016

  1. Correctly create and own directory for PIDs and sockets

    @gchaix
    gchaix committed Sep 15, 2016
    Configuration menu
    Copy the full SHA
    d301a67 View commit details
    Browse the repository at this point in the history