X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=8e4e7f2853e608ccb9ec111c4df378e5d88962a6;hb=c75c473c34b4c183571acdc4018edda86ca1bad6;hp=3f7f4ae0fd198df626aa7ddb62c9f7e19e0c7424;hpb=c3bc960fcdaf791cf4d333698b43bc1c976d6cc4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 3f7f4ae0f..8e4e7f285 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -33,13 +33,28 @@ class munin {
 		require => Package['munin-node'],
 	}
 
-	file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
+	file { '/etc/munin/plugins/df':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df',
+		require => Package['munin-node'],
+		notify  => Service['munin-node'],
+	}
+
+	file { '/etc/munin/plugins/df_abs':
+		ensure  => file,
 		source => 'puppet:///modules/munin/df-wrap',
 		mode    => '0555',
 		require => Package['munin-node'],
 		notify  => Service['munin-node'],
 	}
 
+	file { '/etc/munin/plugins/df_inode':
+		ensure  => link,
+		target  => '/usr/share/munin/plugins/df_inode',
+		require => Package['munin-node'],
+		notify  => Service['munin-node'],
+	}
+
 	@ferm::rule { 'dsa-munin-v4':
 		description     => 'Allow munin from munin master',
 		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) ACCEPT; }',
@@ -53,11 +68,9 @@ class munin {
 		notarule        => true,
 	}
 
-	@@munin::master-per-node {
-		$::fqdn:
+	@@munin::master_per_node { $::fqdn:
 			ipaddress   => $::ipaddress,
 			munin_async => $::munin_async,
-			;
 	}
 
 	#if $::munin_async and str2bool($::munin_async) == true {
@@ -72,6 +85,16 @@ class munin {
 	package { 'munin-async':
 		ensure => installed
 	}
+	service { 'munin-async':
+		ensure  => running,
+		require => Package['munin-async'],
+	}
+	dsa_systemd::override { 'munin-async':
+		content  => @("EOF"),
+			[Service]
+			RestartSec=10
+			| EOF
+	}
 	file { '/etc/ssh/userkeys/munin-async':
 		source => 'puppet:///modules/munin/munin-async-authkeys',
 	}