X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=6d2d0c62d946b222b0875c044139ca20a0b28c4d;hb=25eb0df7b61a728f13208053044f5cd21f07d57d;hp=05c5f798358c946bc265c4b15bbb498478683f28;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=dsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 05c5f798..6d2d0c62 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,72 +1,91 @@
+# = Class: ferm
+#
+# This class installs ferm and sets up rules
+#
+# == Sample Usage:
+#
+#   include ferm
+#
 class ferm {
-	define rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
-	        file { "/etc/ferm/dsa.d/${prio}_${name}":
-	                ensure  => present,
-	                owner   => root,
-	                group   => root,
-	                mode    => 0400,
-	                content => template("ferm/ferm-rule.erb"),
-                        notify  => Exec["ferm restart"],
-	        }
+	# realize (i.e. enable) all @ferm::rule virtual resources
+	Ferm::Rule <| |>
+	Ferm::Conf <| |>
+
+	File { mode => '0400' }
+
+	package { 'ferm':
+		ensure => installed
+	}
+	package { 'ulogd':
+		ensure => installed
 	}
 
-        # realize (i.e. enable) all @ferm::rule virtual resources
-        Ferm::Rule <| |>
+	service { 'ferm':
+		hasstatus   => false,
+		status      => '/bin/true',
+	}
 
-        package {
-                ferm: ensure => installed;
-                ulogd: ensure => installed;
-        }
+	$munin_ips = split(regsubst($::v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
 
-        file { 
-                "/etc/ferm/dsa.d":
-                        ensure => directory,
-                        purge   => true,
-                        force   => true,
-                        recurse => true,
-                        source  => "puppet:///files/empty/",
-                        require => Package["ferm"];
-                "/etc/ferm/conf.d":
-                        ensure => directory,
-                        require => Package["ferm"];
-                "/etc/default/ferm":
-                        source  => "puppet:///ferm/ferm.default",
-                        require => Package["ferm"],
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/ferm.conf":
-                        source  => "puppet:///ferm/ferm.conf",
-                        require => Package["ferm"],
-                        mode    => 0400,
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/conf.d/me.conf":
-                        content => template("ferm/me.conf.erb"),
-                        require => Package["ferm"],
-                        mode    => 0400,
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/conf.d/defs.conf":
-                        content => template("ferm/defs.conf.erb"),
-                        require => Package["ferm"],
-                        mode    => 0400,
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/conf.d/interfaces.conf":
-                        content => template("ferm/interfaces.conf.erb"),
-                        require => Package["ferm"],
-                        mode    => 0400,
-                        notify  => Exec["ferm restart"];
-        }
+	munin::check { $munin_ips: script => 'ip_', }
 
-        $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+	if $v6ips {
+		$munin6_ips = split(regsubst($::v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
+		munin::ipv6check { $munin6_ips: }
+	}
 
-        activate_munin_check {
-            $munin_ips: script => "ip_";
-        }
+	# get rid of old stuff
+	$munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+	munin::check { $munin6_ip6s: ensure => absent }
 
-        exec { "ferm restart":
-                command     => "/etc/init.d/ferm restart",
-                refreshonly => true,
-        }
+	file { '/etc/ferm':
+		ensure  => directory,
+		notify  => Service['ferm'],
+		require => Package['ferm'],
+		mode    => '0755'
+	}
+	file { '/etc/ferm/dsa.d':
+		ensure => directory,
+		mode   => '0555',
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+	}
+	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',
+		require => Package['ferm'],
+		notify  => Service['ferm'],
+		mode    => '0444',
+	}
+	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',
+		mode    => '0444',
+		require => Package['debian.org'],
+	}
 
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: