diff options
| author | Jesse Luehrs <doy@tozt.net> | 2020-07-11 01:41:10 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2020-07-11 01:41:10 -0400 |
| commit | 46259587634a5c95136594e5066372541259e56b (patch) | |
| tree | 23bbe84ce56a83b214b7cf1682ad8ddd100e8c7e | |
| parent | 5c22a2a78960b4327fccfab5fc483e2761f93486 (diff) | |
| download | puppet-tozt-46259587634a5c95136594e5066372541259e56b.tar.gz puppet-tozt-46259587634a5c95136594e5066372541259e56b.zip | |
fix systemd override dependencies
| -rw-r--r-- | modules/cron/manifests/init.pp | 7 | ||||
| -rw-r--r-- | modules/duplicati/manifests/server.pp | 7 | ||||
| -rw-r--r-- | modules/gitea/manifests/init.pp | 7 | ||||
| -rw-r--r-- | modules/munin/manifests/node.pp | 9 | ||||
| -rw-r--r-- | modules/postgres/manifests/init.pp | 2 |
5 files changed, 11 insertions, 21 deletions
diff --git a/modules/cron/manifests/init.pp b/modules/cron/manifests/init.pp index 0d390b6..8e073a4 100644 --- a/modules/cron/manifests/init.pp +++ b/modules/cron/manifests/init.pp @@ -20,10 +20,7 @@ class cron { service { 'cronie': ensure => running, enable => true, - require => [ - Package['cronie'], - Systemd::Override['cronie'], - Exec["/usr/bin/systemctl daemon-reload"], - ]; + subscribe => Systemd::Override['cronie'], + require => Package['cronie']; } } diff --git a/modules/duplicati/manifests/server.pp b/modules/duplicati/manifests/server.pp index 4b5d1f5..112c7dd 100644 --- a/modules/duplicati/manifests/server.pp +++ b/modules/duplicati/manifests/server.pp @@ -23,10 +23,7 @@ class duplicati::server { service { 'duplicati': ensure => running, enable => true, - require => [ - Package::Makepkg['duplicati-latest'], - Systemd::Override['duplicati'], - Exec['/usr/bin/systemctl daemon-reload'], - ]; + subscribe => Systemd::Override['duplicati'], + require => Package::Makepkg['duplicati-latest']; } } diff --git a/modules/gitea/manifests/init.pp b/modules/gitea/manifests/init.pp index df30bbb..8033d07 100644 --- a/modules/gitea/manifests/init.pp +++ b/modules/gitea/manifests/init.pp @@ -11,12 +11,11 @@ class gitea { service { "gitea": ensure => running, enable => true, - require => [ - Package['gitea'], + subscribe => [ Systemd::Override['gitea'], - Exec["/usr/bin/systemctl daemon-reload"], File['/media/persistent/gitea/custom/conf/app.ini'], - ]; + ], + require => Package['gitea']; } $secret_key = secret::value('gitea_secret_key') diff --git a/modules/munin/manifests/node.pp b/modules/munin/manifests/node.pp index 5a001cc..c8dc550 100644 --- a/modules/munin/manifests/node.pp +++ b/modules/munin/manifests/node.pp @@ -5,14 +5,11 @@ class munin::node { service { 'munin-node': ensure => running, enable => true, - require => [ - Package['munin-node'], - Exec['/usr/bin/systemctl daemon-reload'], - ], subscribe => [ - File['/etc/munin/munin-node.conf'], Systemd::Override['munin-node'], - ]; + File['/etc/munin/munin-node.conf'], + ], + require => Package['munin-node']; } file { '/etc/munin/munin-node.conf': diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp index af60384..00c26cb 100644 --- a/modules/postgres/manifests/init.pp +++ b/modules/postgres/manifests/init.pp @@ -49,9 +49,9 @@ class postgres { service { "postgresql": ensure => running, enable => true, + subscribe => Systemd::Override['postgresql'], require => [ Package["postgresql"], - Systemd::Override['postgresql'], Exec["initialize db path"], ]; } |