X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=62ad57376daea0c62ec60600c8a67e2f89127fbf;hb=61b1f29e849df28f2892efc5f98318611e99eeeb;hp=2ad975073281b59005f5357b4b20a07b9a773062;hpb=132ca45393a7d7fe277a5eb391e211d2c1775d24;p=dsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 2ad97507..62ad5737 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: ferm
+#
+# This class installs ferm and sets up rules
+#
+# == Sample Usage:
+#
+#   include ferm
+#
 class ferm {
 	# realize (i.e. enable) all @ferm::rule virtual resources
 	Ferm::Rule <| |>
@@ -22,7 +30,7 @@ class ferm {
 
 	if $v6ips {
 		$munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
-		munin::check { $munin6_ips: script => 'ip_', }
+		munin::ipv6check { $munin6_ips: }
 	}
 
 	# get rid of old stuff
@@ -55,15 +63,19 @@ class ferm {
 	}
 	file { '/etc/ferm/ferm.conf':
 		source  => 'puppet:///modules/ferm/ferm.conf',
+		notify  => Service['ferm'],
 	}
 	file { '/etc/ferm/conf.d/me.conf':
 		content => template('ferm/me.conf.erb'),
+		notify  => Service['ferm'],
 	}
 	file { '/etc/ferm/conf.d/defs.conf':
 		content => template('ferm/defs.conf.erb'),
+		notify  => Service['ferm'],
 	}
 	file { '/etc/ferm/conf.d/interfaces.conf':
 		content => template('ferm/interfaces.conf.erb'),
+		notify  => Service['ferm'],
 	}
 	file { '/etc/logrotate.d/ulogd':
 		source  => 'puppet:///modules/ferm/logrotate-ulogd',
@@ -74,6 +86,7 @@ class ferm {
 	if getfromhash($site::nodeinfo, 'buildd') {
 		file { '/etc/ferm/conf.d/load_ftp_conntrack.conf':
 			source => 'puppet:///modules/ferm/conntrack_ftp.conf',
+			notify  => Service['ferm'],
 		}
 	}