Merge pull request voxpupuli#117 from mayflower/fix/php-fpm-reload

Create upstart service override before installing php-fpm

manifests/fpm.pp

@@ -49,4 +49,14 @@
 
   $real_pools = hiera_hash('php::fpm::pools',  $pools)
   create_resources(::php::fpm::pool, $real_pools)
+
+  # Create an override to use a reload signal as trusty and utopic's
+  # upstart version supports this:q
+  if $::osfamily == 'Debian' and
+    ($::lsbdistcodename == 'trusty' or $::lsbdistcodename == 'utopic') {
+    file { "/etc/init/${::php::fpm::service::service_name}.override":
+      content => 'reload signal USR2',
+      before  => Package[$real_package],
+    }
+  }
 }

manifests/fpm/service.pp

@@ -26,20 +26,9 @@
   if $::osfamily == 'Debian' {
     # Precise upstart doesn't support reload signals, so use
     # regular service restart instead
-    if $::lsbdistcodename == 'precise' {
-      $restart = undef
-    } else {
-      $restart = $reload
-    }
-
-    # Create an override to use a reload signal as trusty and utopic's
-    # upstart version supports this
-    if ($::lsbdistcodename == 'trusty' or
-        $::lsbdistcodename == 'utopic') {
-      file { "/etc/init/${service_name}.override":
-        content => 'reload signal USR2',
-        before  => Service[$service_name],
-      }
+    $restart = $::lsbdistcodename ? {
+      'precise' => undef,
+      default   => $reload
     }
   } else {
     $restart = $reload