X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=3042b183e46f87a4350298c9c2123077f140bb89;hb=131d1d904fb3e556c4b46ac3c00c9861ae95e0c1;hp=9ff8c854224fdb88db164431debdac4efae22f81;hpb=32dde34f7f6c268bbb49fcd7345a3ddacf7ed284;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9ff8c8542..3042b183e 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -17,23 +17,6 @@ define set_alternatives($linkto) {
 
 
 class debian-org {
-   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; }"
-   }
 
    package { "userdir-ldap": ensure => installed;
              "zsh": ensure => installed;