From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 25 Jul 2010 12:55:43 +0000 (+0200)
Subject: Revert "add cilea"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2da3b30e74a926b89270b8d617b0a4a83c5eb6a8;p=mirror%2Fdsa-puppet.git

Revert "add cilea"

This reverts commit 2a3c519f08fd98199d230a7619943851cc990878.
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 1a121b49d..2bf298ed9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -99,7 +99,7 @@ node default {
         agricola,albeniz,gabrielli,merulo,paer,pergolesi,pescetti,smetana,sperger,zee,zelenka: { include ferm }
     }
     case $hostname {
-        orff,duarte,soler,krenek,lindberg,morricone,respighi,scelsi,valente,vitry,vivaldi,wolkenstein,cilea: { include ferm }
+        orff,duarte,soler,krenek,lindberg,morricone,respighi,scelsi,valente,vitry,vivaldi,wolkenstein: { include ferm }
     }
 
     case $hostname {
@@ -199,18 +199,6 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
 	}
-	cilea: {
-           @ferm::rule { "dsa-sip":
-		    domain          => "(ip ip6)",
-		    description     => "Allow sip access",
-		    rule            => "&TCP_UDP_SERVICE(5060)"
-           }
-	   @ferm::rule { "dsa-sipx":
-		    domain          => "(ip ip6)",
-		    description     => "Allow sipx access",
-		    rule            => "&TCP_UDP_SERVICE(5080)"
-	   }
-	}
     }
     case $brokenhosts {
         "true":    { include hosts }