From 1cdc31329b487640ea40baaa845c7a03a5ad9cba Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sat, 29 Aug 2020 08:55:18 +0200
Subject: [PATCH] php-fpm: Make service reload/restart configurable

By default, this module uses a reload for the php-fpm service. This is
nice because it ensures that there is no downtime. But this is also bad
because certain configuration options, like unix socket owner/group will
only be changed during a restart.

Fixes: https://github.com/voxpupuli/puppet-php/issues/596
Replaces: https://github.com/voxpupuli/puppet-php/pull/597
---
 manifests/fpm.pp         | 37 ++++++++++++++++++++++---------------
 manifests/fpm/service.pp | 21 +++++++++++++++++----
 manifests/init.pp        |  7 +++++++
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index 4b2790a3..9f1abbc1 100644
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -53,22 +53,29 @@
 #   Whether to purge pool config files not created
 #   by this module
 #
+# [*reload_fpm_on_config_changes*]
+#   by default, we reload the service on changes.
+#   But certain options, like socket owner, will only be applied during a restart.
+#   If set to false, a restart will be executed instead of a reload.
+#   This default should be changed in a future release.
+#
 class php::fpm (
-  String $ensure                = $php::ensure,
-  $user                         = $php::fpm_user,
-  $group                        = $php::fpm_group,
-  $service_ensure               = $php::fpm_service_ensure,
-  $service_enable               = $php::fpm_service_enable,
-  $service_name                 = $php::fpm_service_name,
-  $service_provider             = $php::fpm_service_provider,
-  String $package               = $php::real_fpm_package,
-  Stdlib::Absolutepath $inifile = $php::fpm_inifile,
-  Hash $settings                = $php::real_settings,
-  $global_pool_settings         = $php::real_fpm_global_pool_settings,
-  Hash $pools                   = $php::real_fpm_pools,
-  $log_owner                    = $php::log_owner,
-  $log_group                    = $php::log_group,
-  Boolean $pool_purge           = $php::pool_purge,
+  String $ensure                        = $php::ensure,
+  $user                                 = $php::fpm_user,
+  $group                                = $php::fpm_group,
+  $service_ensure                       = $php::fpm_service_ensure,
+  $service_enable                       = $php::fpm_service_enable,
+  $service_name                         = $php::fpm_service_name,
+  $service_provider                     = $php::fpm_service_provider,
+  String $package                       = $php::real_fpm_package,
+  Stdlib::Absolutepath $inifile         = $php::fpm_inifile,
+  Hash $settings                        = $php::real_settings,
+  $global_pool_settings                 = $php::real_fpm_global_pool_settings,
+  Hash $pools                           = $php::real_fpm_pools,
+  $log_owner                            = $php::log_owner,
+  $log_group                            = $php::log_group,
+  Boolean $pool_purge                   = $php::pool_purge,
+  Boolean $reload_fpm_on_config_changes = $php::reload_fpm_on_config_changes,
 ) {
   if ! defined(Class['php']) {
     warning('php::fpm is private')
diff --git a/manifests/fpm/service.pp b/manifests/fpm/service.pp
index 33a7b9a6..3b9fb0e9 100644
--- a/manifests/fpm/service.pp
+++ b/manifests/fpm/service.pp
@@ -14,21 +14,34 @@
 # [*provider*]
 #   Defines if the service provider to use
 #
+# [*reload_fpm_on_config_changes*]
+#   by default, we reload the service on changes.
+#   But certain options, like socket owner, will only be applied during a restart.
+#   If set to false, a restart will be executed instead of a reload.
+#   This default should be changed in a future release.
+#
 class php::fpm::service (
-  $service_name = $php::fpm::service_name,
-  $ensure       = $php::fpm::service_ensure,
-  $enable       = $php::fpm::service_enable,
-  $provider     = $php::fpm::service_provider,
+  $service_name                         = $php::fpm::service_name,
+  $ensure                               = $php::fpm::service_ensure,
+  $enable                               = $php::fpm::service_enable,
+  $provider                             = $php::fpm::service_provider,
+  Boolean $reload_fpm_on_config_changes = $php::fpm::reload_fpm_on_config_changes,
 ) {
   if ! defined(Class['php::fpm']) {
     warning('php::fpm::service is private')
   }
 
+  if $reload_fpm_on_config_changes {
+    $restart = "service ${service_name} reload"
+  } else {
+    $restart = undef
+  }
   service { $service_name:
     ensure     => $ensure,
     enable     => $enable,
     provider   => $provider,
     hasrestart => true,
+    restart    => $restart,
     hasstatus  => true,
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 1035bbc1..100c5400 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -127,6 +127,12 @@
 #   Whether to purge pool config files not created
 #   by this module
 #
+# [*reload_fpm_on_config_changes*]
+#   by default, we reload the service on changes.
+#   But certain options, like socket owner, will only be applied during a restart.
+#   If set to false, a restart will be executed instead of a reload.
+#   This default should be changed in a future release.
+#
 class php (
   String $ensure                                  = $php::params::ensure,
   Boolean $manage_repos                           = $php::params::manage_repos,
@@ -162,6 +168,7 @@
   String $log_owner                               = $php::params::fpm_user,
   String $log_group                               = $php::params::fpm_group,
   Boolean $pool_purge                             = $php::params::pool_purge,
+  Boolean $reload_fpm_on_config_changes           = true,
 ) inherits php::params {
   $real_fpm_package = pick($fpm_package, "${package_prefix}${php::params::fpm_package_suffix}")