X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=manifests%2Finstall.pp;h=f683aad6a00765ce7a97e15bd1ddefc8593b21e0;hb=795801ce2490026d3ec40b4c0abb4c1cbe06c567;hp=de016eea87b389507fbbe69152a5377e9b794605;hpb=6695957284364e91c83f013086dd6aaa7b9efb4f;p=user%2Fhenk%2Fcode%2Fpuppet%2Fmodules%2Fs6.git

diff --git a/manifests/install.pp b/manifests/install.pp
index de016ee..f683aad 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -5,22 +5,47 @@ class s6::install {
     ;
   }
   file {
-    '/usr/local/bin/s6-svscanboot':
-      ensure  => present,
-      source  => 'puppet:///modules/s6/usr/local/bin/s6-svscanboot',
-      mode    => '0755',
-      require => Package['s6'],
+    '/etc/s6-services/':
+      ensure => directory,
     ;
-    '/etc/init.d/s6':
-      ensure  => present,
-      source  => 'puppet:///modules/s6/etc/init.d/s6',
-      mode    => '0755',
-      require => Package['s6'],
+    '/etc/s6-scandir/':
+      ensure => directory,
     ;
-    '/etc/s6-services/':
+    '/var/log/s6/':
       ensure => directory,
     ;
   }
+
+  if $facts['service_provider'] == 'systemd' {
+    file {
+      '/etc/systemd/system/s6.service':
+        ensure  => present,
+        source  => 'puppet:///modules/s6/etc/systemd/system/s6.service',
+        require => Package['s6'],
+        notify  => Class['s6::service'],
+      ;
+    }
+  } else {
+    file {
+      '/usr/local/bin/s6-svscanboot':
+        ensure  => present,
+        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'],
+      ;
+    }
+  }
   user {
     's6-logs':
       ensure => present,