X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=6d2d0c62d946b222b0875c044139ca20a0b28c4d;hb=ad97a3db379027eb0d9f49b5cc623b2b2f648a6e;hp=44872de480c73198ddf799c7acf675f43da67b39;hpb=cd48f056e69f38a8278fceef4a3fa8269eca1c83;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 44872de48..6d2d0c62d 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,6 +1,15 @@
+# = 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 <| |>
+	Ferm::Conf <| |>
 
 	File { mode => '0400' }
 
@@ -16,17 +25,17 @@ class ferm {
 		status      => '/bin/true',
 	}
 
-	$munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+	$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::check { $munin6_ips: script => 'ip_', }
+		$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'), ',')
+	$munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
 	munin::check { $munin6_ip6s: ensure => absent }
 
 	file { '/etc/ferm':
@@ -37,6 +46,7 @@ class ferm {
 	}
 	file { '/etc/ferm/dsa.d':
 		ensure => directory,
+		mode   => '0555',
 		purge   => true,
 		force   => true,
 		recurse => true,
@@ -44,33 +54,38 @@ 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',
 		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',
+		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',
-		}
-	}
-
 }