X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=71964c4295a5cff1c0591ecea51f0233443e6801;hb=7fbd1fb63f9a8e87683b183e8b39bce18af59a4a;hp=84fc808d735283d09b5b004793c54243881a98cf;hpb=c46d1f99d0294179797fb90e3b9fc5b44780bde5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 84fc808d7..71964c429 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,56 +1,102 @@
 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 <| |>
-
-        package { ferm: ensure => installed }
-
-        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/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"];
+    define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00", $notarule=false) {
+        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"],
         }
+    }
 
-        exec { "ferm restart":
-                command     => "/etc/init.d/ferm restart",
-                refreshonly => true,
+    # realize (i.e. enable) all @ferm::rule virtual resources
+    Ferm::Rule <| |>
+
+    package {
+            ferm: ensure => installed;
+            ulogd: ensure => installed;
+    }
+
+    file {
+        "/etc/ferm/dsa.d":
+            ensure => directory,
+            purge   => true,
+            force   => true,
+            recurse => true,
+            source  => "puppet:///files/empty/",
+            notify  => Exec["ferm restart"],
+            require => Package["ferm"];
+        "/etc/ferm":
+            ensure  => directory,
+            mode    => 0755;
+        "/etc/ferm/conf.d":
+            ensure => directory,
+            require => Package["ferm"];
+        "/etc/default/ferm":
+            source  => "puppet:///modules/ferm/ferm.default",
+            require => Package["ferm"],
+            notify  => Exec["ferm restart"];
+        "/etc/ferm/ferm.conf":
+            source  => "puppet:///modules/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"];
+        "/etc/logrotate.d/ulogd":
+            source => "puppet:///modules/ferm/logrotate-ulogd",
+            require => Package["logrotate"],
+            ;
+    }
+
+    $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+
+    activate_munin_check {
+        $munin_ips: script => "ip_";
+    }
+
+    case getfromhash($nodeinfo, 'buildd') {
+        true: {
+            file {
+                "/etc/ferm/conf.d/load_ftp_conntrack.conf":
+                    source => "puppet:///modules/ferm/conntrack_ftp.conf",
+                    require => Package["ferm"],
+                    notify  => Exec["ferm restart"];
+            }
+        }
+    }
+
+    case $v6ips {
+        'no': {}
+        default: {
+            $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+            activate_munin_check {
+                $munin6_ips: script => "ip6_";
+            }
         }
+    }
 
+    exec {
+        "ferm restart":
+            command     => "/etc/init.d/ferm restart",
+            refreshonly => true,
+    }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: