refactor for saner notifications

diff --git a/manifests/config.pp b/manifests/config.pp
deleted file mode 100644 (file)
index 3431ef8..0000000
--- a/manifests/config.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class s6::config {
-  $basedir = '/etc/s6-services/s6-logrotater'
-
-  file {
-    $basedir:
-      ensure => directory,
-      mode   => '0600',
-    ;
-
-    "${basedir}/run":
-      ensure  => present,
-      content => epp("s6/${basedir}/run.epp"),
-      mode    => '0700',
-    ;
-  }
-
-  $s6::scandir_users.each | $entry | {
-    s6::user_scandir {
-      $entry: ;
-    }
-  }
-}

diff --git a/manifests/init.pp b/manifests/init.pp
index 833fd8c669be4de4dd1d49b18d63aa4c2cfd55b0..cf1c5dbbe8dee55bdd5396b8b93ce94bd87b7517 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,12 +4,9 @@ class s6 (
   require 'execline'
 
   class {
-    "${name}::install":
-      notify => Class["${name}::service"],
-    ;
-    "${name}::config":
-      notify => Class["${name}::service"],
-    ;
+    "${name}::install": ;
+    "${name}::scandir_users": ;
+    "${name}::logrotater": ;
     "${name}::service": ;
   }
 }

diff --git a/manifests/install.pp b/manifests/install.pp
index b6f80b45dae2c91a72d03c624aedda332f9d026a..9609076b25b5e45c671a9fbc9a114a5a39f0c677 100644 (file)
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -13,12 +13,14 @@ class s6::install {
       ],
       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,

diff --git a/manifests/logrotater.pp b/manifests/logrotater.pp
new file mode 100644 (file)
index 0000000..a864241
--- /dev/null
+++ b/manifests/logrotater.pp
@@ -0,0 +1,16 @@
+class s6::logrotater {
+  $basedir = '/etc/s6-services/s6-logrotater'
+
+  file {
+    $basedir:
+      ensure => directory,
+      mode   => '0600',
+    ;
+
+    "${basedir}/run":
+      ensure  => present,
+      content => epp("s6/${basedir}/run.epp"),
+      mode    => '0700',
+    ;
+  }
+}

diff --git a/manifests/scandir_users.pp b/manifests/scandir_users.pp
new file mode 100644 (file)
index 0000000..30734ce
--- /dev/null
+++ b/manifests/scandir_users.pp
@@ -0,0 +1,7 @@
+class s6::scandir_users {
+  $s6::scandir_users.each | $entry | {
+    s6::user_scandir {
+      $entry: ;
+    }
+  }
+}