X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=44872de480c73198ddf799c7acf675f43da67b39;hb=cd48f056e69f38a8278fceef4a3fa8269eca1c83;hp=ebf8fe57d2e19b7c73c984a425f55dcfdd2c1fa4;hpb=29a4c4d0b38abbd11c7e21235382e460215b172d;p=dsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index ebf8fe57..44872de4 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,40 +1,76 @@
 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    => 0600,
-	                content => template("ferm/ferm-rule.erb"),
-	        }
-	}
-
-        package { ferm: ensure => installed }
-
-        file { 
-                "/etc/ferm/dsa.d": 
-                        ensure => directory,
-                        require => Package["ferm"];
-                "/etc/ferm/conf.d": 
-                        ensure => directory,
-                        require => Package["ferm"];
-                "/etc/ferm/ferm.conf":
-                        source  => "puppet:///ferm/ferm.conf",
-                        require => Package["ferm"],
-                        notify  => Exec["ferm restart"];
-                "/etc/ferm/conf.d/me.conf":
-                        content => template("ferm/me.conf.erb"),
-                        require => Package["ferm"],
-                        notify  => Exec["ferm restart"];
-        }
-
-        ferm::rule { "dsa-ssh":
-                description     => "Allow SSH from DSA",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain "ssh" { saddr ($MY_SSH_ACCEPT_HOSTS) ACCEPT; }
-        }
-
-        exec { "ferm restart":
-                path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                refreshonly => true,
-        }
+	# 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::check { $munin6_ips: script => 'ip_', }
+	}
+
+	# 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,
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+	}
+	file { '/etc/ferm/conf.d':
+		ensure => directory,
+	}
+	file { '/etc/default/ferm':
+		source  => 'puppet:///modules/ferm/ferm.default',
+		require => Package['ferm'],
+		notify  => Service['ferm'],
+	}
+	file { '/etc/ferm/ferm.conf':
+		source  => 'puppet:///modules/ferm/ferm.conf',
+	}
+	file { '/etc/ferm/conf.d/me.conf':
+		content => template('ferm/me.conf.erb'),
+	}
+	file { '/etc/ferm/conf.d/defs.conf':
+		content => template('ferm/defs.conf.erb'),
+	}
+	file { '/etc/ferm/conf.d/interfaces.conf':
+		content => template('ferm/interfaces.conf.erb'),
+	}
+	file { '/etc/logrotate.d/ulogd':
+		source => 'puppet:///modules/ferm/logrotate-ulogd',
+		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',
+		}
+	}
+
 }