diff options
| author | Hendrik Jäger <gitcommit@henk.geekmail.org> | 2022-05-22 11:37:38 +0200 |
|---|---|---|
| committer | Hendrik Jäger <gitcommit@henk.geekmail.org> | 2022-07-25 23:53:04 +0200 |
| commit | c64fda634f8609c54196a6223f1e67fb3e0fddc3 (patch) | |
| tree | ae3b41940802bfcb7d2091c20202b9f9b4df2761 | |
| parent | 855826195c08bd568d3d5bd0e60d1ccde9a810f0 (diff) | |
refactor for saner notifications
| -rw-r--r-- | manifests/init.pp | 9 | ||||
| -rw-r--r-- | manifests/install.pp | 2 | ||||
| -rw-r--r-- | manifests/logrotater.pp (renamed from manifests/config.pp) | 8 | ||||
| -rw-r--r-- | manifests/scandir_users.pp | 7 |
4 files changed, 13 insertions, 13 deletions
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 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: ; + } + } +} |