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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index adf1fc88..62ad5737 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,63 +1,93 @@
+# = Class: ferm
+#
+# This class installs ferm and sets up rules
+#
+# == Sample Usage:
+#
+#   include ferm
 #
-
 class ferm {
-	package { "ferm" :
-		ensure		=> installed,
-	}
-
-	file { "/etc/ferm/dsa.d" :
-		ensure		=> directory,
-		owner		=> root,
-		group		=> root,
-		mode		=> 0700,
-		require 	=> Package["ferm"],
-	}
-
-	file { "/etc/ferm/conf.d" :
-		ensure		=>directory,
-		owner		=> root,
-		group		=> root,
-		mode		=> 0700,
-		require		=> Package["ferm"],
-	}
-
-	file { "/etc/ferm/ferm.conf" :
-		ensure		=> present,
-		owner		=> root,
-		group		=> root,
-		mode		=> 0600,
-		require		=> Package["ferm"],
-		notify		=> Exec["ferm reload"],
-		source		=> "puppet:///ferm/ferm.conf",
-	}
-
-	file { "/etc/ferm/defs.conf" :
-		ensure		=> present,
-		owner		=> root,
-		group		=> root,
-		mode		=> 0600,
-		require		=> Package["ferm"],
-		notify		=> Exec["ferm reload"],
-		source		=> "puppet:///ferm/defs.conf",
-	}
-
-	exec { "ferm reload":
-		path		=> "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly	=> true,
-	}
-
-	# used as, e.g.:
-	# ferm::rule { "dsa-ssh":
-	# 	description	=> "Allow SSH from DSA",
-	# 	rule		=> "proto tcp dport ssh saddr 1.2.3.4 ACCEPT"
-	# }
-	define rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
-		file { "/etc/ferm/dsa.d/${prio}_${name}":
-			ensure	=> present,
-			owner	=> root,
-			group	=> root,
-			mode	=> 0600,
-			content => template("ferm/ferm-rule.erb"),
+	# realize (i.e. enable) all @ferm::rule virtual resources
+	Ferm::Rule <| |>
+
+	File { mode => '0400' }
+
+	package { 'ferm':
+		ensure => installed
+	}
+	package { 'ulogd':
+		ensure => installed
+	}
+
+	service { 'ferm':
+		hasstatus   => false,
+		status      => '/bin/true',
+	}
+
+	$munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+
+	munin::check { $munin_ips: script => 'ip_', }
+
+	if $v6ips {
+		$munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
+		munin::ipv6check { $munin6_ips: }
+	}
+
+	# get rid of old stuff
+	$munin6_ip6s = split(regsubst($v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+	munin::check { $munin6_ip6s: ensure => absent }
+
+	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',
+	}
+	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'],
+	}
+
+	if getfromhash($site::nodeinfo, 'buildd') {
+		file { '/etc/ferm/conf.d/load_ftp_conntrack.conf':
+			source => 'puppet:///modules/ferm/conntrack_ftp.conf',
+			notify  => Service['ferm'],
 		}
 	}
+
 }