X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Freal.pp;h=23fe0bbe66085c092364b888f984052ab23e55c3;hb=c0e53775066a91f5249c367408c72df04d9ff363;hp=6ad7bccd4a3900959c35ae4d90948f81c9238796;hpb=31cc527d395038046cf965a79fc3b9ea9aed6160;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/real.pp b/modules/ferm/manifests/real.pp
index 6ad7bccd4..23fe0bbe6 100644
--- a/modules/ferm/manifests/real.pp
+++ b/modules/ferm/manifests/real.pp
@@ -1,4 +1,4 @@
-class ferm::real {
+class ferm::real inherits ferm {
 
         package { ferm: ensure => installed }
 
@@ -9,36 +9,21 @@ class ferm::real {
                 "/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":
                         source  => "puppet:///ferm/defs.conf",
                         require => Package["ferm"],
+                        mode    => 0400,
                         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 (\$SSH_SOURCES) ACCEPT; }"
-        }
-        ferm::rule { "dsa-ssh-v6":
-                description     => "Allow SSH from DSA",
-                domain          => "ip6",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }"
-        }
-        ferm::rule { "dsa-munin":
-                description     => "Allow munin from munin master",
-                rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
-        }
-        ferm::rule { "dsa-nagios":
-                description     => "Allow nrpe from nagios master",
-                rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
-        }
-
-        exec { "ferm restart":
+        Exec["ferm restart"] {
                 path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
                 refreshonly => true,
         }