move all files to explicit new-style module/ paths

[dsa-puppet.git] / modules / ferm / manifests / init.pp

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index adf1fc88a16996e030953779abdf48c1c723616d..d67f8fb65e74dcec106ebb0e845d6cc6f4074438 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,63 +1,101 @@
-#
-
 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"),
-               }
-       }
+    define rule($domain="ip", $table="filter", $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;
+            ulogd: ensure => installed;
+    }
+
+    file {
+        "/etc/ferm/dsa.d":
+            ensure => directory,
+            purge   => true,
+            force   => true,
+            recurse => true,
+            source  => "puppet:///files/empty/",
+            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 extractnodeinfo($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: