Issue 4073 - Improve Nginx integration with "upstart" service provider

modules/nginx/manifests/init.pp

 class nginx (
     $worker_processes = $nginx::params::worker_processes,
     $worker_connections = $nginx::params::worker_connections,
     $ssl_session_cache =  $nginx::params::ssl_session_cache,
     $geoip_country = undef,
     $geoip_city = undef,
   ) inherits nginx::params {
 
   apt::ppa {'ppa:nginx/stable':
   }
@@ skipping 29 matching lines @@
 
   Exec {
     path => '/usr/bin:/bin',
     logoutput => 'on_failure',
   }
 
 
   file {'/etc/nginx/nginx.conf':
     content => template('nginx/nginx.conf.erb'),
     require => Package['nginx'],
+    notify => Service['nginx']
   }
 
   file {'/etc/nginx/sites-available':
     ensure => directory,
     require => Package['nginx']
   }
 
   file {'/etc/nginx/sites-enabled':
     ensure => directory,
     require => Package['nginx']
@@ skipping 132 matching lines @@
   exec {"set_logfiles_permissions":
     command => shellquote($find_chmod_base, $find_chmod_exec),
     unless => shellquote($find_chmod_base, $find_kill_exec),
     subscribe => Service['nginx'],
   }
 
   $restart_command = join([
     'set -e',
     'pid=`cat /var/run/nginx.pid`',
     'kill -USR2 "$pid"',
-    'sleep 1',
+    'sleep 2',
     'kill -QUIT "$pid"',
   ], "\n")
 
   service {'nginx':
     ensure => running,
     enable => true,
+    restart => $restart_command,
     hasstatus => true,
     require => Package['nginx'],
-    restart => $restart_command,
-    subscribe => File['/etc/nginx/nginx.conf'],
   }
 
   file {'/usr/share/nginx/html/50x.html':
     mode => 0644,
     owner => 'root',
     require => Package['nginx'],
     source => 'puppet:///modules/nginx/50x.html',
   }
 }