summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2019-03-18 01:49:19 -0400
committerJesse Luehrs <doy@tozt.net>2019-03-18 01:49:19 -0400
commit219782a7352d6571eab79fa7a70358f17f88d073 (patch)
tree50fde862b8fc68b4d339ddb4836d7ac9af0717a6
parent65959c72de7518b0e56c99f1bbb12e7edc1995b6 (diff)
downloadpuppet-tozt-219782a7352d6571eab79fa7a70358f17f88d073.tar.gz
puppet-tozt-219782a7352d6571eab79fa7a70358f17f88d073.zip
wait for algo to come up before starting munin-node
since we bind to the algo address
-rw-r--r--modules/munin/files/override.conf2
-rw-r--r--modules/munin/manifests/init.pp8
2 files changed, 10 insertions, 0 deletions
diff --git a/modules/munin/files/override.conf b/modules/munin/files/override.conf
new file mode 100644
index 0000000..3f925fa
--- /dev/null
+++ b/modules/munin/files/override.conf
@@ -0,0 +1,2 @@
+[Unit]
+After=wg-quick@algo.service
diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 970fa21..10ef433 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -1,4 +1,6 @@
class munin {
+ include systemd
+
package { 'munin':
}
@@ -11,6 +13,12 @@ class munin {
'/etc/munin/munin.conf':
source => 'puppet:///modules/munin/munin.conf',
require => Package['munin'];
+ "/etc/systemd/system/munin-node.service.d":
+ ensure => directory;
+ '/etc/systemd/system/munin-node.service.d/override.conf':
+ source => 'puppet:///modules/munin/override.conf',
+ notify => Exec["/usr/bin/systemctl daemon-reload"],
+ require => File["/etc/systemd/system/munin-node.service.d"];
}
exec { 'install munin crontab':