From c64fda634f8609c54196a6223f1e67fb3e0fddc3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hendrik=20J=C3=A4ger?= <gitcommit@henk.geekmail.org>
Date: Sun, 22 May 2022 11:37:38 +0200
Subject: [PATCH 1/1] refactor for saner notifications

---
 manifests/init.pp                      | 9 +++------
 manifests/install.pp                   | 2 ++
 manifests/{config.pp => logrotater.pp} | 8 +-------
 manifests/scandir_users.pp             | 7 +++++++
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename manifests/{config.pp => logrotater.pp} (70%)
 create mode 100644 manifests/scandir_users.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 833fd8c..cf1c5db 100644
--- 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 b6f80b4..9609076 100644
--- 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/config.pp b/manifests/logrotater.pp
similarity index 70%
rename from manifests/config.pp
rename to manifests/logrotater.pp
index 3431ef8..a864241 100644
--- a/manifests/config.pp
+++ b/manifests/logrotater.pp
@@ -1,4 +1,4 @@
-class s6::config {
+class s6::logrotater {
   $basedir = '/etc/s6-services/s6-logrotater'
 
   file {
@@ -13,10 +13,4 @@ class s6::config {
       mode    => '0700',
     ;
   }
-
-  $s6::scandir_users.each | $entry | {
-    s6::user_scandir {
-      $entry: ;
-    }
-  }
 }
diff --git a/manifests/scandir_users.pp b/manifests/scandir_users.pp
new file mode 100644
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: ;
+    }
+  }
+}
-- 
2.39.5