From 77043b45d263146c8b95bdd5f28fe4c87eaeb349 Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Mon, 18 Jan 2010 23:11:32 +0000
Subject: [PATCH] stop including ferm for now

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 manifests/site.pp                    | 3 ---
 modules/munin-node/manifests/init.pp | 5 -----
 modules/nagios/manifests/init.pp     | 5 -----
 modules/ssh/manifests/init.pp        | 6 ------
 4 files changed, 19 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index b10857915..2bc7939d8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -84,7 +84,4 @@ node default {
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
-    case $hostname {
-	brahms: { include ferm }
-    }
 }
diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 79eaa6265..29bef07fe 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -75,10 +75,5 @@ class munin-node {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
-    ferm::rule { "dsa-munin":
-        description     => "Allow munin-node from spohr.debian.org",
-        rule            => 'proto tcp dport 4949 saddr $HOST_MUNIN ACCEPT',
-	prio		=> "02"
-   }
 }
 
diff --git a/modules/nagios/manifests/init.pp b/modules/nagios/manifests/init.pp
index 70e08658a..13c0dc911 100644
--- a/modules/nagios/manifests/init.pp
+++ b/modules/nagios/manifests/init.pp
@@ -2,9 +2,4 @@ class nagios {
 	package {
 		nagios-nrpe-server: ensure => installed;
 	}
-	ferm::rule { "dsa-nagios":
-		description     => "Allow nrpe from spohr.debian.org",
-		rule            => 'proto tcp dport 5666 saddr $HOST_NAGIOS ACCEPT',
-		prio		=> "03"
-	}
 }
diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index b3e32e34c..9b253832c 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -37,11 +37,5 @@ class ssh {
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true,
         }
-        ferm::rule { "dsa-ssh":
-        	description     => "Allow SSH",
-        	rule            => "proto tcp dport ssh ACCEPT",
-		domain		=> "(ip ip6)",
-		prio		=> "01"
-        }
 
 }
-- 
2.20.1