From 12f1e8f7a0d940af72af85dd55a43747310fc548 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Thu, 1 Sep 2016 15:46:46 -0700
Subject: [PATCH 01/19] 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.
---
 manifests/fpm/systemd-socket-conf.pp | 127 +++++++++++
 templates/fpm/pool-systemd.conf.erb  | 305 +++++++++++++++++++++++++++
 templates/fpm/pool.service.erb       |   5 +
 templates/fpm/pool.socket.erb        |   5 +
 4 files changed, 442 insertions(+)
 create mode 100644 manifests/fpm/systemd-socket-conf.pp
 create mode 100644 templates/fpm/pool-systemd.conf.erb
 create mode 100644 templates/fpm/pool.service.erb
 create mode 100644 templates/fpm/pool.socket.erb

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
new file mode 100644
index 0000000..b2b0493
--- /dev/null
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -0,0 +1,127 @@
+# Define: php::fpm::systemd-socket-conf
+#
+# PHP FPM pool configuration definition. Note that the original php-fpm package
+# includes a pre-configured one called 'www' so you should either use that name
+# in order to override it, or "ensure => absent" it.
+#
+# Sample Usage:
+#  php::fpm::systemd-socket-conf { 'www': ensure => absent }
+#  php::fpm::systemd-socket-conf { 'customer1':
+#      listen      => '/var/run/php-fpm/customer1.socket',
+#      listen_port => 9001,
+#      user        => 'customer1',
+#  }
+#  php::fpm::systemd-socket-conf { 'customer2':
+#      listen      => '/var/run/php-fpm/customer1.socket',
+#      listen_port => 9002,
+#      user        => 'customer2',
+#  }
+#
+define php::fpm::systemd-socket-conf (
+  $ensure                    = 'present',
+  $package_name              = undef,
+  $service_name              = undef,
+  $user                      = 'apache',
+  $group                     = undef,
+  $listen                    = undef,
+  $listen_port               = '9000',
+  # Puppet does not allow dots in variable names
+  $listen_backlog            = '-1',
+  $listen_owner              = undef,
+  $listen_group              = undef,
+  $listen_mode               = undef,
+  $listen_allowed_clients    = '127.0.0.1',
+  $process_priority          = undef,
+  $pm                        = 'dynamic',
+  $pm_max_children           = '50',
+  $pm_start_servers          = '5',
+  $pm_min_spare_servers      = '5',
+  $pm_max_spare_servers      = '35',
+  $pm_process_idle_timeout   = undef,
+  $pm_max_requests           = '0',
+  $pm_status_path            = undef,
+  $ping_path                 = undef,
+  $ping_response             = 'pong',
+  $slowlog                   = "/var/log/php-fpm/${name}-slow.log",
+  $request_slowlog_timeout   = undef,
+  $request_terminate_timeout = undef,
+  $rlimit_files              = undef,
+  $rlimit_core               = undef,
+  $chroot                    = undef,
+  $chdir                     = undef,
+  $catch_workers_output      = 'no',
+  $security_limit_extensions = undef,
+  $env                       = [],
+  $env_value                 = {},
+  $php_value                 = {},
+  $php_flag                  = {},
+  $php_admin_value           = {},
+  $php_admin_flag            = {},
+  $php_directives            = [],
+  $error_log                 = true,
+) {
+
+  include '::php::params'
+
+  $pool = $title
+
+  # Create systemd socket
+  file { "/usr/lib/systemd/system/php-fpm-${pool}.socket":
+    ensure  => $ensure,
+    content => template('php/fpm/pool.socket.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    require => Package[$fpm_package_name],
+  }
+
+  service { "php-fpm-${pool}.socket":
+    ensure => running,
+    start  => 'systemctl start php-fpm-${pool}.socket',
+    stop   => 'systemctl stop php-fpm-${pool}.socket',
+    status => 'systemctl status php-fpm-${pool}.socket',
+  }
+
+  # Create per-pool service
+  $service_name = 'php-fpm-${pool}.service'
+  file { "/usr/lib/systemd/system/php-fpm-${pool}.service":
+    ensure  => $ensure,
+    content => template('php/fpm/pool.service.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    require => Package[$fpm_package_name],
+  }
+
+  service { "${service_name}":
+    ensure => running,
+    start  => 'systemctl start php-fpm-${pool}.service',
+    stop   => 'systemctl stop php-fpm-${pool}.service',
+    status => 'systemctl status php-fpm-${pool}.service',
+  }
+
+  # Hack-ish to default to user for group too
+  $group_final = $group ? { undef => $user, default => $group }
+
+  # This is much easier from classes which inherit params...
+  $fpm_package_name = $package_name ? {
+    undef   => $::php::params::fpm_package_name,
+    default => $package_name,
+  }
+  $fpm_service_name = $service_name ? {
+    undef   => $::php::params::fpm_service_name,
+    default => $service_name,
+  }
+
+  file { "${php::params::fpm_pool_dir}/${pool}.conf":
+    ensure  => $ensure,
+    content => template('php/fpm/pool-systemd.conf.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    require => Package[$fpm_package_name],
+    notify  => Service[$fpm_service_name],
+  }
+
+}
+
diff --git a/templates/fpm/pool-systemd.conf.erb b/templates/fpm/pool-systemd.conf.erb
new file mode 100644
index 0000000..9ccd084
--- /dev/null
+++ b/templates/fpm/pool-systemd.conf.erb
@@ -0,0 +1,305 @@
+[global]
+pid = /var/run/php-fpm/<%= @pool %>.pid
+error_log = syslog
+daemonize = no
+
+; Start a new pool named '<%= @pool %>'.
+[<%= @pool %>]
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses on a
+;                            specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = /var/run/php-fpm/<%= @pool %>.socket
+
+; Set listen(2) backlog. A value of '-1' means unlimited.
+; Default Value: -1
+listen.backlog = <%= @listen_backlog %>
+
+; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+<% if @listen_allowed_clients == 'any' -%>
+;listen.allowed_clients =
+<% else -%>
+listen.allowed_clients = <%= @listen_allowed_clients %>
+<% end -%>
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions. 
+; Default Values: user and group are set as the running user
+;                 mode is set to 0660
+<% if @listen_owner -%>
+listen.owner = <%= @listen_owner %>
+<% else -%>
+;listen.owner = nobody
+<% end -%>
+<% if @listen_group -%>
+listen.group = <%= @listen_group %>
+<% else -%>
+;listen.group = nobody
+<% end -%>
+<% if @listen_mode -%>
+listen.mode = <%= @listen_mode %>
+<% else -%>
+;listen.mode = 0666
+<% end -%>
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+; RPM: apache Choosed to be able to access some dir as httpd
+user = <%= @user %>
+; RPM: Keep a group allowed to write in log dir.
+group = <%= @group_final %>
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives:
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+; Note: This value is mandatory.
+pm = <%= @pm %>
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes to be created when pm is set to 'dynamic'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI.
+; Note: Used when pm is set to either 'static' or 'dynamic'
+; Note: This value is mandatory.
+pm.max_children = <%= @pm_max_children %>
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = <%= @pm_start_servers %>
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = <%= @pm_min_spare_servers %>
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = <%= @pm_max_spare_servers %>
+ 
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+pm.max_requests = <%= @pm_max_requests %>
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. By default, the status page shows the following
+; information:
+;   accepted conn    - the number of request accepted by the pool;
+;   pool             - the name of the pool;
+;   process manager  - static or dynamic;
+;   idle processes   - the number of idle processes;
+;   active processes - the number of active processes;
+;   total processes  - the number of idle + active processes.
+; The values of 'idle processes', 'active processes' and 'total processes' are
+; updated each second. The value of 'accepted conn' is updated in real time.
+; Example output:
+;   accepted conn:   12073
+;   pool:             www
+;   process manager:  static
+;   idle processes:   35
+;   active processes: 65
+;   total processes:  100
+; By default the status page output is formatted as text/plain. Passing either
+; 'html' or 'json' as a query string will return the corresponding output
+; syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set 
+<% if @pm_status_path -%>
+pm.status_path = <%= @pm_status_path %>
+<% else -%>
+;pm.status_path = /status
+<% end -%>
+ 
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+<% if @ping_path -%>
+ping.path = <%= @ping_path %>
+<% else -%>
+;ping.path = /ping
+<% end -%>
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+ping.response = <%= @ping_response %>
+ 
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+<% if @request_terminate_timeout -%>
+request_terminate_timeout = <%= @request_terminate_timeout %>
+<% else -%>
+;request_terminate_timeout = 0
+<% end -%>
+ 
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+<% if @request_slowlog_timeout -%>
+request_slowlog_timeout = <%= @request_slowlog_timeout %>
+<% else -%>
+;request_slowlog_timeout = 0
+<% end -%>
+ 
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+slowlog = <%= @slowlog %>
+ 
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+<% if @rlimit_files -%>
+rlimit_files = <%= @rlimit_files %>
+<% else -%>
+;rlimit_files = 1024
+<% end -%>
+ 
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+<% if @rlimit_core -%>
+rlimit_core = <%= @rlimit_core %>
+<% else -%>
+;rlimit_core = 0
+<% end -%>
+ 
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: chrooting is a great security feature and should be used whenever 
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+<% if @chroot -%>
+chroot = <%= @chroot %>
+<% else -%>
+;chroot = 
+<% end -%>
+ 
+; Chdir to this directory at the start. This value must be an absolute path.
+; Default Value: current directory or / when chroot
+<% if @chdir -%>
+chdir = <%= @chdir %>
+<% else -%>
+;chdir = /var/www
+<% end -%>
+ 
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Default Value: no
+catch_workers_output = <%= @catch_workers_output %>
+ 
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; exectute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+<% if @security_limit_extensions -%>
+security.limit_extensions = <%= @security_limit_extensions %>
+<% else -%>
+;security.limit_extensions = .php .php3 .php4 .php5
+<% end -%>
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+<% @env.each do |var| -%>
+env[<%= var %>] = $<%= var %>
+<% end -%>
+<% @env_value.sort_by {|key,value| key}.each do |key,value| -%>
+env[<%= key %>] = <%= value %>
+<% end -%>
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'. 
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[memory_limit] = 128M
+<% if @error_log == true -%>
+php_admin_value[error_log] = /var/log/php-fpm/<%= @pool %>-error.log
+php_admin_flag[log_errors] = on
+<% elsif @error_log and !@error_log.empty? -%>
+php_admin_value[error_log] = <%= @error_log %>
+php_admin_flag[log_errors] = on
+<% end -%>
+<% @php_value.sort_by {|key,value| key}.each do |key,value| -%>
+php_value[<%= key %>] = <%= value %>
+<% end -%>
+<% @php_flag.sort_by {|key,flag| key}.each do |key,flag| -%>
+php_flag[<%= key %>] = <%= flag %>
+<% end -%>
+<% @php_admin_value.sort_by {|key,value| key}.each do |key,value| -%>
+php_admin_value[<%= key %>] = <%= value %>
+<% end -%>
+<% @php_admin_flag.sort_by {|key,flag| key}.each do |key,flag| -%>
+php_admin_flag[<%= key %>] = <%= flag %>
+<% end -%>
+<% @php_directives.each do |line| -%>
+<%= line %>
+<% end -%>
+
diff --git a/templates/fpm/pool.service.erb b/templates/fpm/pool.service.erb
new file mode 100644
index 0000000..5e43f02
--- /dev/null
+++ b/templates/fpm/pool.service.erb
@@ -0,0 +1,5 @@
+[Service]
+ExecStart=/sbin/php-fpm --fpm-config=/etc/php-fpm.d/<%= @pool %>.conf
+User=<%= @user %>
+Group=<%= @group %>
+Environment="FPM_SOCKETS=/var/run/php-fpm/<%= @pool %>.socket=3"
diff --git a/templates/fpm/pool.socket.erb b/templates/fpm/pool.socket.erb
new file mode 100644
index 0000000..e2c5c40
--- /dev/null
+++ b/templates/fpm/pool.socket.erb
@@ -0,0 +1,5 @@
+[Socket]
+ListenStream=<%= @listen_port %>
+
+[Install]
+WantedBy=sockets.target

From 71c2e780e87dd006728d7aa5889095b1d86c79c2 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Fri, 2 Sep 2016 18:41:16 -0700
Subject: [PATCH 02/19] Add pid directory, listen address, cleanup

---
 manifests/fpm/systemd-socket-conf.pp | 55 +++++++++++++++-------------
 templates/fpm/pool-systemd.conf.erb  |  2 +-
 templates/fpm/pool.socket.erb        |  4 ++
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index b2b0493..75fee0d 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -24,6 +24,7 @@
   $user                      = 'apache',
   $group                     = undef,
   $listen                    = undef,
+  $listen_address            = '127.0.0.1',
   $listen_port               = '9000',
   # Puppet does not allow dots in variable names
   $listen_backlog            = '-1',
@@ -65,6 +66,15 @@
 
   $pool = $title
 
+  # Hack-ish to default to user for group too
+  $group_final = $group ? { undef => $user, default => $group }
+
+  # This is much easier from classes which inherit params...
+  $fpm_package_name = $package_name ? {
+    undef   => $::php::params::fpm_package_name,
+    default => $package_name,
+  }
+
   # Create systemd socket
   file { "/usr/lib/systemd/system/php-fpm-${pool}.socket":
     ensure  => $ensure,
@@ -72,45 +82,38 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package[$fpm_package_name],
+    #require => Package[$fpm_package_name],
   }
 
-  service { "php-fpm-${pool}.socket":
+  $socket_service_name = "php-fpm-${pool}.socket"
+
+  service { $socket_service_name:
     ensure => running,
-    start  => 'systemctl start php-fpm-${pool}.socket',
-    stop   => 'systemctl stop php-fpm-${pool}.socket',
-    status => 'systemctl status php-fpm-${pool}.socket',
+    enable => true,
   }
 
   # Create per-pool service
-  $service_name = 'php-fpm-${pool}.service'
+
+  # Create "/var/run/php-fpm/php-systemd/" writable by $user because the daemon does not start as root
+  file { "/var/run/php-fpm/php-systemd/":
+    ensure => 'directory',
+    owner  => $user,
+    group  => $group,
+  }
+
+  $systemd_service_name = "php-fpm-${pool}.service"
   file { "/usr/lib/systemd/system/php-fpm-${pool}.service":
     ensure  => $ensure,
     content => template('php/fpm/pool.service.erb'),
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package[$fpm_package_name],
+    #require => Package[$fpm_package_name],
   }
 
-  service { "${service_name}":
+  service { $systemd_service_name:
     ensure => running,
-    start  => 'systemctl start php-fpm-${pool}.service',
-    stop   => 'systemctl stop php-fpm-${pool}.service',
-    status => 'systemctl status php-fpm-${pool}.service',
-  }
-
-  # Hack-ish to default to user for group too
-  $group_final = $group ? { undef => $user, default => $group }
-
-  # This is much easier from classes which inherit params...
-  $fpm_package_name = $package_name ? {
-    undef   => $::php::params::fpm_package_name,
-    default => $package_name,
-  }
-  $fpm_service_name = $service_name ? {
-    undef   => $::php::params::fpm_service_name,
-    default => $service_name,
+    enable => true,
   }
 
   file { "${php::params::fpm_pool_dir}/${pool}.conf":
@@ -119,8 +122,8 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package[$fpm_package_name],
-    notify  => Service[$fpm_service_name],
+    #require => Package[$fpm_package_name],
+    notify  => Service[$systemd_service_name],
   }
 
 }
diff --git a/templates/fpm/pool-systemd.conf.erb b/templates/fpm/pool-systemd.conf.erb
index 9ccd084..380f281 100644
--- a/templates/fpm/pool-systemd.conf.erb
+++ b/templates/fpm/pool-systemd.conf.erb
@@ -1,5 +1,5 @@
 [global]
-pid = /var/run/php-fpm/<%= @pool %>.pid
+pid = /var/run/php-fpm/php-systemd/<%= @pool %>.pid
 error_log = syslog
 daemonize = no
 
diff --git a/templates/fpm/pool.socket.erb b/templates/fpm/pool.socket.erb
index e2c5c40..952811c 100644
--- a/templates/fpm/pool.socket.erb
+++ b/templates/fpm/pool.socket.erb
@@ -1,5 +1,9 @@
 [Socket]
+<% if @listen_address %>
+ListenStream=<%= @listen_address %>:<%= @listen_port %>
+<% else %>
 ListenStream=<%= @listen_port %>
+<% end %>
 
 [Install]
 WantedBy=sockets.target

From bbdfb2b5842520a39fa9454f2c7e14f42baadf9a Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Fri, 2 Sep 2016 19:03:02 -0700
Subject: [PATCH 03/19] 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.
---
 manifests/fpm/systemd-socket-conf.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index 75fee0d..317197e 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -112,7 +112,6 @@
   }
 
   service { $systemd_service_name:
-    ensure => running,
     enable => true,
   }
 

From 54a206460047bd6a18f2c1a853570fec99703b93 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Mon, 5 Sep 2016 14:38:32 -0700
Subject: [PATCH 04/19] Ensure services are created and started in the right
 order

---
 manifests/fpm/systemd-socket-conf.pp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index 317197e..922ffdb 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -88,8 +88,9 @@
   $socket_service_name = "php-fpm-${pool}.socket"
 
   service { $socket_service_name:
-    ensure => running,
-    enable => true,
+    ensure  => running,
+    enable  => true,
+    require => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
   }
 
   # Create per-pool service
@@ -112,7 +113,9 @@
   }
 
   service { $systemd_service_name:
-    enable => true,
+    enable    => true,
+    subscribe => Service[$socket_service_name],
+    require   => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
   }
 
   file { "${php::params::fpm_pool_dir}/${pool}.conf":

From 911997724ac65036e2b885d7a88b36b05c27c9ef Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Mon, 5 Sep 2016 14:57:58 -0700
Subject: [PATCH 05/19] Ensure both service and socket files are in place
 before starting either

---
 manifests/fpm/systemd-socket-conf.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index 922ffdb..f523581 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -91,6 +91,7 @@
     ensure  => running,
     enable  => true,
     require => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
+    require => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
   }
 
   # Create per-pool service
@@ -116,6 +117,7 @@
     enable    => true,
     subscribe => Service[$socket_service_name],
     require   => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
+    require   => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
   }
 
   file { "${php::params::fpm_pool_dir}/${pool}.conf":

From 7fc3daf8de910fd8cc8ea20dd47af7c5813b4db7 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Mon, 5 Sep 2016 15:05:45 -0700
Subject: [PATCH 06/19] Remove duplicate requires

---
 manifests/fpm/systemd-socket-conf.pp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index f523581..ab05bdc 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -88,10 +88,10 @@
   $socket_service_name = "php-fpm-${pool}.socket"
 
   service { $socket_service_name:
-    ensure  => running,
-    enable  => true,
-    require => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
-    require => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
+    ensure    => running,
+    enable    => true,
+    subscribe => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
+    require   => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
   }
 
   # Create per-pool service
@@ -117,7 +117,6 @@
     enable    => true,
     subscribe => Service[$socket_service_name],
     require   => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
-    require   => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
   }
 
   file { "${php::params::fpm_pool_dir}/${pool}.conf":

From 7e86983c2786ed78eaa24283ae957d3bd3a07709 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Mon, 5 Sep 2016 17:22:12 -0700
Subject: [PATCH 07/19] 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.
---
 manifests/fpm/systemd-daemon.pp      | 38 ++++++++++++++++++++++++++++
 manifests/fpm/systemd-socket-conf.pp | 12 +--------
 2 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 manifests/fpm/systemd-daemon.pp

diff --git a/manifests/fpm/systemd-daemon.pp b/manifests/fpm/systemd-daemon.pp
new file mode 100644
index 0000000..f959e4b
--- /dev/null
+++ b/manifests/fpm/systemd-daemon.pp
@@ -0,0 +1,38 @@
+# Class: php::fpm::systemd-daemon
+#
+# Install the PHP FPM daemon. See php::fpm::systemd-socket-conf for configuring its pools.
+#
+# Sample Usage:
+#  include php::fpm::systemd-daemon
+#
+class php::fpm::systemd-daemon (
+  $ensure                      = 'present',
+  $package_name                = $::php::params::fpm_package_name,
+  $fpm_pool_dir                = $::php::params::fpm_pool_dir,
+  $fpm_conf_dir                = $::php::params::fpm_conf_dir,
+  $log_owner                   = 'apache',
+  $log_group                   = 'apache',
+) inherits ::php::params {
+
+  # Hack-ish to default to user for group too
+  $log_group_final = $log_group ? {
+    false   => $log_owner,
+    default => $log_group,
+  }
+
+  package { $package_name: ensure => $ensure }
+
+  if ( $ensure != 'absent' ) {
+
+    # Create "/var/run/php-fpm/php-systemd/" as group-writable because the daemon does not start as root
+    file { "/var/run/php-fpm/php-systemd/":
+      ensure => 'directory',
+      owner  => $log_owner,
+      group  => $log_group_final,
+			mode	 => '0775',
+    }
+
+  }
+
+}
+
diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index ab05bdc..5599f22 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -82,7 +82,7 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    #require => Package[$fpm_package_name],
+    require => Package[$fpm_package_name],
   }
 
   $socket_service_name = "php-fpm-${pool}.socket"
@@ -95,14 +95,6 @@
   }
 
   # Create per-pool service
-
-  # Create "/var/run/php-fpm/php-systemd/" writable by $user because the daemon does not start as root
-  file { "/var/run/php-fpm/php-systemd/":
-    ensure => 'directory',
-    owner  => $user,
-    group  => $group,
-  }
-
   $systemd_service_name = "php-fpm-${pool}.service"
   file { "/usr/lib/systemd/system/php-fpm-${pool}.service":
     ensure  => $ensure,
@@ -110,7 +102,6 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    #require => Package[$fpm_package_name],
   }
 
   service { $systemd_service_name:
@@ -125,7 +116,6 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    #require => Package[$fpm_package_name],
     notify  => Service[$systemd_service_name],
   }
 

From 6fbc20b255134ef7c736119626339533984e1aad Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Mon, 5 Sep 2016 17:25:05 -0700
Subject: [PATCH 08/19] Make names consistent

---
 manifests/fpm/systemd-daemon.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/fpm/systemd-daemon.pp b/manifests/fpm/systemd-daemon.pp
index f959e4b..5c8341c 100644
--- a/manifests/fpm/systemd-daemon.pp
+++ b/manifests/fpm/systemd-daemon.pp
@@ -10,14 +10,14 @@
   $package_name                = $::php::params::fpm_package_name,
   $fpm_pool_dir                = $::php::params::fpm_pool_dir,
   $fpm_conf_dir                = $::php::params::fpm_conf_dir,
-  $log_owner                   = 'apache',
-  $log_group                   = 'apache',
+  $owner                   = 'apache',
+  $group                   = 'apache',
 ) inherits ::php::params {
 
   # Hack-ish to default to user for group too
-  $log_group_final = $log_group ? {
-    false   => $log_owner,
-    default => $log_group,
+  $group_final = $group ? {
+    false   => $owner,
+    default => $group,
   }
 
   package { $package_name: ensure => $ensure }
@@ -27,8 +27,8 @@
     # Create "/var/run/php-fpm/php-systemd/" as group-writable because the daemon does not start as root
     file { "/var/run/php-fpm/php-systemd/":
       ensure => 'directory',
-      owner  => $log_owner,
-      group  => $log_group_final,
+      owner  => $owner,
+      group  => $group_final,
 			mode	 => '0775',
     }
 

From 919b088069a3e998f2c015a60693c7d0f662b114 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Mon, 5 Sep 2016 18:30:17 -0700
Subject: [PATCH 09/19] Clean up whitespace/indent

---
 manifests/fpm/systemd-daemon.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/fpm/systemd-daemon.pp b/manifests/fpm/systemd-daemon.pp
index 5c8341c..5ec7380 100644
--- a/manifests/fpm/systemd-daemon.pp
+++ b/manifests/fpm/systemd-daemon.pp
@@ -29,7 +29,7 @@
       ensure => 'directory',
       owner  => $owner,
       group  => $group_final,
-			mode	 => '0775',
+      mode	 => '0775',
     }
 
   }

From a7dfc9a0436401845e0567ca0a685d0aa76bb589 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 11:26:30 -0700
Subject: [PATCH 10/19] Make sure /var/run/php-fpm exists

---
 manifests/fpm/systemd-daemon.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/fpm/systemd-daemon.pp b/manifests/fpm/systemd-daemon.pp
index 5ec7380..9d9b289 100644
--- a/manifests/fpm/systemd-daemon.pp
+++ b/manifests/fpm/systemd-daemon.pp
@@ -23,6 +23,12 @@
   package { $package_name: ensure => $ensure }
 
   if ( $ensure != 'absent' ) {
+    file { "/var/run/php-fpm":
+      ensure => 'directory',
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0775',
+    }
 
     # Create "/var/run/php-fpm/php-systemd/" as group-writable because the daemon does not start as root
     file { "/var/run/php-fpm/php-systemd/":

From 9e26a895dceff77e5e8bbcc942db070d844cdbfa Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 11:35:26 -0700
Subject: [PATCH 11/19] Set ${service_path} depending on distribution

---
 manifests/fpm/systemd-socket-conf.pp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index 5599f22..97a8efd 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -75,8 +75,17 @@
     default => $package_name,
   }
 
+  # The path to systemd/system varies
+  case $::osfamily {
+    'Debian': {
+      $service_path = '/lib/systemd/system'
+    }
+    default: {
+      $service_path = '/usr/lib/systemd/system'
+    }
+
   # Create systemd socket
-  file { "/usr/lib/systemd/system/php-fpm-${pool}.socket":
+  file { "${service_path}/php-fpm-${pool}.socket":
     ensure  => $ensure,
     content => template('php/fpm/pool.socket.erb'),
     owner   => 'root',
@@ -90,13 +99,13 @@
   service { $socket_service_name:
     ensure    => running,
     enable    => true,
-    subscribe => File["/usr/lib/systemd/system/php-fpm-${pool}.socket"],
-    require   => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
+    subscribe => File["${service_path}/php-fpm-${pool}.socket"],
+    require   => File["${service_path}/php-fpm-${pool}.service"],
   }
 
   # Create per-pool service
   $systemd_service_name = "php-fpm-${pool}.service"
-  file { "/usr/lib/systemd/system/php-fpm-${pool}.service":
+  file { "${service_path}/php-fpm-${pool}.service":
     ensure  => $ensure,
     content => template('php/fpm/pool.service.erb'),
     owner   => 'root',
@@ -107,7 +116,7 @@
   service { $systemd_service_name:
     enable    => true,
     subscribe => Service[$socket_service_name],
-    require   => File["/usr/lib/systemd/system/php-fpm-${pool}.service"],
+    require   => File["${service_path}/php-fpm-${pool}.service"],
   }
 
   file { "${php::params::fpm_pool_dir}/${pool}.conf":

From 588badbddb24aec43b388d29735721e5c5a57b67 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 11:36:52 -0700
Subject: [PATCH 12/19] Darn closing bracket

---
 manifests/fpm/systemd-socket-conf.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index 97a8efd..e9b46a6 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -83,6 +83,7 @@
     default: {
       $service_path = '/usr/lib/systemd/system'
     }
+  }
 
   # Create systemd socket
   file { "${service_path}/php-fpm-${pool}.socket":

From fb711310869e36bdbe2f89b8f28b8ec683d1b9f1 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 12:02:50 -0700
Subject: [PATCH 13/19] Abstraction for osfamily

Move systemd service path into params.pp
Add binary to params.pp
Make service template use binary parameter
---
 manifests/fpm/systemd-socket-conf.pp | 20 +++++---------------
 manifests/params.pp                  |  4 ++++
 templates/fpm/pool.service.erb       |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index e9b46a6..c88325d 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -75,18 +75,8 @@
     default => $package_name,
   }
 
-  # The path to systemd/system varies
-  case $::osfamily {
-    'Debian': {
-      $service_path = '/lib/systemd/system'
-    }
-    default: {
-      $service_path = '/usr/lib/systemd/system'
-    }
-  }
-
   # Create systemd socket
-  file { "${service_path}/php-fpm-${pool}.socket":
+  file { "${systemd_service_path}/php-fpm-${pool}.socket":
     ensure  => $ensure,
     content => template('php/fpm/pool.socket.erb'),
     owner   => 'root',
@@ -100,13 +90,13 @@
   service { $socket_service_name:
     ensure    => running,
     enable    => true,
-    subscribe => File["${service_path}/php-fpm-${pool}.socket"],
-    require   => File["${service_path}/php-fpm-${pool}.service"],
+    subscribe => File["${systemd_service_path}/php-fpm-${pool}.socket"],
+    require   => File["${systemd_service_path}/php-fpm-${pool}.service"],
   }
 
   # Create per-pool service
   $systemd_service_name = "php-fpm-${pool}.service"
-  file { "${service_path}/php-fpm-${pool}.service":
+  file { "${systemd_service_path}/php-fpm-${pool}.service":
     ensure  => $ensure,
     content => template('php/fpm/pool.service.erb'),
     owner   => 'root',
@@ -117,7 +107,7 @@
   service { $systemd_service_name:
     enable    => true,
     subscribe => Service[$socket_service_name],
-    require   => File["${service_path}/php-fpm-${pool}.service"],
+    require   => File["${systemd_service_path}/php-fpm-${pool}.service"],
   }
 
   file { "${php::params::fpm_pool_dir}/${pool}.conf":
diff --git a/manifests/params.pp b/manifests/params.pp
index 75fbfd5..de32516 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -19,6 +19,8 @@
       $httpd_package_name = 'apache2'
       $httpd_service_name = 'apache2'
       $httpd_conf_dir = '/etc/apache2/conf.d'
+      $systemd_service_path = '/lib/systemd/system'
+      $binary = '/usr/sbin/php5-fpm'
     }
     default: {
       $php_package_name = 'php'
@@ -37,6 +39,8 @@
       $httpd_package_name = 'httpd'
       $httpd_service_name = 'httpd'
       $httpd_conf_dir = '/etc/httpd/conf.d'
+      $systemd_service_path = '/usr/lib/systemd/system'
+      $binary = '/sbin/php-fpm'
     }
   }
 }
diff --git a/templates/fpm/pool.service.erb b/templates/fpm/pool.service.erb
index 5e43f02..706b59a 100644
--- a/templates/fpm/pool.service.erb
+++ b/templates/fpm/pool.service.erb
@@ -1,5 +1,5 @@
 [Service]
-ExecStart=/sbin/php-fpm --fpm-config=/etc/php-fpm.d/<%= @pool %>.conf
+ExecStart=<%= @binary %> --fpm-config=/etc/php-fpm.d/<%= @pool %>.conf
 User=<%= @user %>
 Group=<%= @group %>
 Environment="FPM_SOCKETS=/var/run/php-fpm/<%= @pool %>.socket=3"

From e991bd0e4a4560d53a516e7d06fd1699fc1769b8 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 12:10:26 -0700
Subject: [PATCH 14/19] Differentiate it as the fpm_binary in params

---
 manifests/params.pp            | 4 ++--
 templates/fpm/pool.service.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index de32516..e520706 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -20,7 +20,7 @@
       $httpd_service_name = 'apache2'
       $httpd_conf_dir = '/etc/apache2/conf.d'
       $systemd_service_path = '/lib/systemd/system'
-      $binary = '/usr/sbin/php5-fpm'
+      $fpm_binary = '/usr/sbin/php5-fpm'
     }
     default: {
       $php_package_name = 'php'
@@ -40,7 +40,7 @@
       $httpd_service_name = 'httpd'
       $httpd_conf_dir = '/etc/httpd/conf.d'
       $systemd_service_path = '/usr/lib/systemd/system'
-      $binary = '/sbin/php-fpm'
+      $fpm_binary = '/sbin/php-fpm'
     }
   }
 }
diff --git a/templates/fpm/pool.service.erb b/templates/fpm/pool.service.erb
index 706b59a..2998a5d 100644
--- a/templates/fpm/pool.service.erb
+++ b/templates/fpm/pool.service.erb
@@ -1,5 +1,5 @@
 [Service]
-ExecStart=<%= @binary %> --fpm-config=/etc/php-fpm.d/<%= @pool %>.conf
+ExecStart=<%= @fpm_binary %> --fpm-config=/etc/php-fpm.d/<%= @pool %>.conf
 User=<%= @user %>
 Group=<%= @group %>
 Environment="FPM_SOCKETS=/var/run/php-fpm/<%= @pool %>.socket=3"

From d648cebe7642bd74c9ee8a749e6004be462d5b8f Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 12:44:21 -0700
Subject: [PATCH 15/19] Explicitly set 'systemctl' as the start/stop/status

Puppet on Debian wants to call 'service' instead of 'systemctl'.
---
 manifests/fpm/systemd-socket-conf.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index c88325d..d0f886f 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -90,6 +90,9 @@
   service { $socket_service_name:
     ensure    => running,
     enable    => true,
+    start     => "systemctl start ${socket_service_name}",
+    stop      => "systemctl stop ${socket_service_name}",
+    status    => "systemctl status ${socket_service_name}",
     subscribe => File["${systemd_service_path}/php-fpm-${pool}.socket"],
     require   => File["${systemd_service_path}/php-fpm-${pool}.service"],
   }
@@ -106,6 +109,9 @@
 
   service { $systemd_service_name:
     enable    => true,
+    start     => "systemctl start ${systemd_service_name}",
+    stop      => "systemctl stop ${systemd_service_name}",
+    status    => "systemctl status $systemd_service_name}",
     subscribe => Service[$socket_service_name],
     require   => File["${systemd_service_path}/php-fpm-${pool}.service"],
   }

From 7910ebc0883910fabe6fab8cbdb968df9d532c8e Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 12:58:34 -0700
Subject: [PATCH 16/19] Make sure php::fpm::systemd-socket-conf knows all
 params

---
 manifests/fpm/systemd-socket-conf.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index d0f886f..4b08c33 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -60,6 +60,8 @@
   $php_admin_flag            = {},
   $php_directives            = [],
   $error_log                 = true,
+  $systemd_service_path      = $::php::params::systemd_service_path,
+  $fpm_binary                = $::php::params::fpm_binary,
 ) {
 
   include '::php::params'

From 27a20c67f1ca7fcec65a1a95a249c594fdd0d898 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 15:30:35 -0700
Subject: [PATCH 17/19] Set $fpm_pool_dir in template

---
 manifests/fpm/systemd-socket-conf.pp | 3 ++-
 templates/fpm/pool.service.erb       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/fpm/systemd-socket-conf.pp b/manifests/fpm/systemd-socket-conf.pp
index 4b08c33..dc09040 100644
--- a/manifests/fpm/systemd-socket-conf.pp
+++ b/manifests/fpm/systemd-socket-conf.pp
@@ -62,6 +62,7 @@
   $error_log                 = true,
   $systemd_service_path      = $::php::params::systemd_service_path,
   $fpm_binary                = $::php::params::fpm_binary,
+  $fpm_pool_dir              = $::php::params::fpm_pool_dir,
 ) {
 
   include '::php::params'
@@ -118,7 +119,7 @@
     require   => File["${systemd_service_path}/php-fpm-${pool}.service"],
   }
 
-  file { "${php::params::fpm_pool_dir}/${pool}.conf":
+  file { "${fpm_pool_dir}/${pool}.conf":
     ensure  => $ensure,
     content => template('php/fpm/pool-systemd.conf.erb'),
     owner   => 'root',
diff --git a/templates/fpm/pool.service.erb b/templates/fpm/pool.service.erb
index 2998a5d..5d2f5f8 100644
--- a/templates/fpm/pool.service.erb
+++ b/templates/fpm/pool.service.erb
@@ -1,5 +1,5 @@
 [Service]
-ExecStart=<%= @fpm_binary %> --fpm-config=/etc/php-fpm.d/<%= @pool %>.conf
+ExecStart=<%= @fpm_binary %> --fpm-config=<%=fpm_pool_dir %>/<%= @pool %>.conf
 User=<%= @user %>
 Group=<%= @group %>
 Environment="FPM_SOCKETS=/var/run/php-fpm/<%= @pool %>.socket=3"

From b69c66f0b7cf84879a9fd540033c3edfafd089ac Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Tue, 6 Sep 2016 15:32:31 -0700
Subject: [PATCH 18/19] Fix fpm_pool_dir in template

---
 templates/fpm/pool.service.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/fpm/pool.service.erb b/templates/fpm/pool.service.erb
index 5d2f5f8..8c1caff 100644
--- a/templates/fpm/pool.service.erb
+++ b/templates/fpm/pool.service.erb
@@ -1,5 +1,5 @@
 [Service]
-ExecStart=<%= @fpm_binary %> --fpm-config=<%=fpm_pool_dir %>/<%= @pool %>.conf
+ExecStart=<%= @fpm_binary %> --fpm-config=<%= @fpm_pool_dir %>/<%= @pool %>.conf
 User=<%= @user %>
 Group=<%= @group %>
 Environment="FPM_SOCKETS=/var/run/php-fpm/<%= @pool %>.socket=3"

From d301a6715319af609ba6b0862ecc0af4c5f7b757 Mon Sep 17 00:00:00 2001
From: Greg Lund-Chaix <greg@tag1consulting.com>
Date: Wed, 14 Sep 2016 18:42:26 -0700
Subject: [PATCH 19/19] Correctly create and own directory for PIDs and sockets

---
 templates/fpm/pool-systemd.conf.erb | 2 +-
 templates/fpm/pool.service.erb      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/fpm/pool-systemd.conf.erb b/templates/fpm/pool-systemd.conf.erb
index 380f281..9ccd084 100644
--- a/templates/fpm/pool-systemd.conf.erb
+++ b/templates/fpm/pool-systemd.conf.erb
@@ -1,5 +1,5 @@
 [global]
-pid = /var/run/php-fpm/php-systemd/<%= @pool %>.pid
+pid = /var/run/php-fpm/<%= @pool %>.pid
 error_log = syslog
 daemonize = no
 
diff --git a/templates/fpm/pool.service.erb b/templates/fpm/pool.service.erb
index 8c1caff..64b477e 100644
--- a/templates/fpm/pool.service.erb
+++ b/templates/fpm/pool.service.erb
@@ -1,5 +1,7 @@
 [Service]
-ExecStart=<%= @fpm_binary %> --fpm-config=<%= @fpm_pool_dir %>/<%= @pool %>.conf
 User=<%= @user %>
 Group=<%= @group %>
 Environment="FPM_SOCKETS=/var/run/php-fpm/<%= @pool %>.socket=3"
+RuntimeDirectory=php-fpm
+RuntimeDirectoryMode=0755
+ExecStart=<%= @fpm_binary %> --fpm-config=<%= @fpm_pool_dir %>/<%= @pool %>.conf