ordering fixups

[dsa-puppet.git] / modules / ferm / manifests / init.pp

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 2ad975073281b59005f5357b4b20a07b9a773062..03025d53533dd857a385da953ab3270ed06c619a 100644 (file)
--- 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
@@ -46,6 +54,10 @@ class ferm {
        file { '/etc/ferm/conf.d':
                ensure => directory,
                mode   => '0555',
+               purge   => true,
+               force   => true,
+               recurse => true,
+               source  => 'puppet:///files/empty/',
        }
        file { '/etc/default/ferm':
                source  => 'puppet:///modules/ferm/ferm.default',
@@ -55,15 +67,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',
@@ -71,10 +87,4 @@ class ferm {
                require => Package['debian.org'],
        }
 
-       if getfromhash($site::nodeinfo, 'buildd') {
-               file { '/etc/ferm/conf.d/load_ftp_conntrack.conf':
-                       source => 'puppet:///modules/ferm/conntrack_ftp.conf',
-               }
-       }
-
 }