Merge pull request #167 from skrivy/master

#163 Added ability to purge fpm pools

manifests/fpm.pp

@@ -23,6 +23,9 @@
 #   Hash with 'set' nested hash of key => value
 #   set changes to agues when applied to *inifile*
 #
+# [*purge_pools*]
+#   When true, purges all pool files which are not managed by puppet
+#
 # === Variables
 #
 # No variables
@@ -66,6 +69,8 @@
   $rlimit_core                  = $php::fpm::params::rlimit_core,
   $events_mechanism             = $php::fpm::params::events_mechanism,
 
+  $purge_pools                  = $php::fpm::params::purge_pools,
+
 ) inherits php::fpm::params {
 
   class  { 'php::fpm::package':
@@ -84,10 +89,10 @@
   }
 
   php::fpm::config { 'php-fpm':
-    file    => $inifile,
-    config  => $settings,
+    file         => $inifile,
+    config       => $settings,
     service_name => $service_name,
-    require => Package[$package]
+    require      => Package[$package]
   }
 
   file { '/etc/php5/fpm/php-fpm.conf':
@@ -99,4 +104,12 @@
     require => Package[$package]
   }
 
+  if ($purge_pools) {
+    file { "/etc/php5/fpm/pool.d/":
+      recurse => true,
+      purge   => true,
+      require => Package[$package]
+    }
+  }
+
 }

manifests/fpm/params.pp

@@ -26,6 +26,9 @@
 #   Hash with 'set' nested hash of key => value
 #   set changes to agues when applied to *inifile*
 #
+# [*purge_pools*]
+#   When true, purges all pool files which are not managed by puppet
+#
 # === Examples
 #
 # No examples
@@ -68,4 +71,5 @@
   $rlimit_core                  = 0
   $events_mechanism             = undef
 
+  $purge_pools                  = false
 }