refactor for saner notifications

[user/henk/code/puppet/modules/s6.git] / manifests / install.pp

diff --git a/manifests/install.pp b/manifests/install.pp
index f26627691009fd5630d7fa0cdd087428f00227b4..9609076b25b5e45c671a9fbc9a114a5a39f0c677 100644 (file)
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -7,15 +7,20 @@ class s6::install {
   file {
     '/usr/local/bin/s6-svscanboot':
       ensure  => present,
-      source  => 'puppet:///modules/s6/usr/local/bin/s6-svscanboot',
+      source  => [
+        "puppet:///modules/s6/usr/local/bin/s6-svscanboot.${facts['os']['distro']['codename']}",
+        'puppet:///modules/s6/usr/local/bin/s6-svscanboot',
+      ],
       mode    => '0755',
       require => Package['s6'],
+      notify  => Class['s6::service'],
     ;
     '/etc/init.d/s6':
       ensure  => present,
       source  => 'puppet:///modules/s6/etc/init.d/s6',
       mode    => '0755',
       require => Package['s6'],
+      notify  => Class['s6::service'],
     ;
     '/etc/s6-services/':
       ensure => directory,
@@ -23,6 +28,9 @@ class s6::install {
     '/etc/s6-scandir/':
       ensure => directory,
     ;
+    '/var/log/s6/':
+      ensure => directory,
+    ;
   }
   user {
     's6-logs':