X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=37b30303e715fc66457404bff77c12067a57d043;hb=07542997c11a1d8769a9fa21a660c0650e426c05;hp=ee50bd0a3109ba2dcda57f4b48e5d1fa0f3803ad;hpb=215ea6ef7a868fe83c46a02fa84a06e3e2631ed6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index ee50bd0a3..37b30303e 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -9,6 +9,13 @@ class munin {
 		require => Package['munin-node'],
 	}
 
+	file { '/var/log/munin':
+		ensure => directory,
+		owner  => root,
+		group  => 'www-data',
+		mode   => '0755',
+	}
+
 	file { '/etc/munin/munin-node.conf':
 		content => template('munin/munin-node.conf.erb'),
 		require => Package['munin-node'],
@@ -21,9 +28,28 @@ class munin {
 		notify  => Service['munin-node'],
 	}
 
-	file { [ '/etc/munin/plugins/df', '/etc/munin/plugins/df_abs', '/etc/munin/plugins/df_inode' ]:
-		source => 'puppet:///modules/munin/df-wrap',
-		mode    => '0555',
+	file { '/etc/logrotate.d/munin-node':
+		source => 'puppet:///modules/munin/logrotate',
+		require => Package['munin-node'],
+	}
+
+	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  => link,
+		target  => '/usr/share/munin/plugins/df_abs',
+		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'],
 	}
@@ -40,4 +66,27 @@ class munin {
 		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V6 $HOST_NAGIOS_V6) ACCEPT; }',
 		notarule        => true,
 	}
+
+	@@munin::master-per-node {
+		$::fqdn:
+			ipaddress   => $::ipaddress,
+			munin_async => $::munin_async,
+			;
+	}
+
+	#if $::munin_async and str2bool($::munin_async) == true {
+	#	file { '/etc/ssh/userkeys/munin-async':
+	#		source => 'puppet:///modules/munin/munin-async-authkeys',
+	#	}
+	#} else {
+	#	file { '/etc/ssh/userkeys/munin-async':
+	#		ensure => 'absent',
+	#	}
+	#}
+	package { 'munin-async':
+		ensure => installed
+	}
+	file { '/etc/ssh/userkeys/munin-async':
+		source => 'puppet:///modules/munin/munin-async-authkeys',
+	}
 }