Merge pull request #107 from mayflower/fix/upstart-reload

Fix reloading php-fpm on trusty & utopic

manifests/fpm/service.pp

@@ -21,11 +21,36 @@
     warning('php::fpm::service is private')
   }
 
+  $reload = "service ${service_name} reload"
+
+  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],
+      }
+    }
+  } else {
+    $restart = $reload
+  }
+
   service { $service_name:
-    ensure    => $ensure,
-    enable    => $enable,
-    restart   => "service ${service_name} reload",
-    hasstatus => true,
+    ensure     => $ensure,
+    enable     => $enable,
+    hasrestart => true,
+    restart    => $restart,
+    hasstatus  => true,
   }
 
   ::Php::Extension <| |> ~> Service[$service_name]