From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 27 Apr 2014 20:05:59 +0000 (+0200)
Subject: no more cilea
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=010f7916e255994e9e7311517da0a47a8f5de00a

no more cilea

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 6d232bb7..86b46945 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -27,7 +27,6 @@ nameinfo:
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   clementi.debian.org: Muzio Clementi (January 23rd, 1752 - March 10th, 1832)
   chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
-  cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950)
   coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833)
   corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
   couper.debian.org: Mildred Couper (1887 - 1974)
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 273e6a54..3170e168 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -130,21 +130,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(tcp, 636)'
 			}
 		}
-		cilea: {
-			ferm::module { 'nf_conntrack_sip': }
-			ferm::module { 'nf_conntrack_h323': }
-
-			@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)'
-			}
-		}
 		sonntag: {
 			@ferm::rule { 'dsa-bugs-search':
 				description  => 'port 1978 for bugs-search from bug web frontends',
diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index f19fb1fd..a9906f87 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -6,7 +6,6 @@
 <%=
 ignore = []
 case fqdn
-when "cilea.debian.org" then                                   ignore << "/freeswitch.*/"
 when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser}
 when /orff.debian.org/ then                                    ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl}
 when /(zandonai|zelenka).debian.org/ then                      ignore << %w{samhain zabbix-agent rrdcollect}
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index f45d7ba7..159ec256 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -29,7 +29,7 @@ Host_Alias	FTPHOSTS	= franck
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= respighi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= rautavaara, sibelius
-Host_Alias	MPTRAIDHOSTS	= barber, biber, cilea, vitry, orff
+Host_Alias	MPTRAIDHOSTS	= barber, biber, vitry, orff
 Host_Alias	MEGACTLHOSTS	= nielsen
 Host_Alias	LISTHOSTS	= bendel
 Host_Alias	BUILDD_MASTER	= wuiet
@@ -96,7 +96,6 @@ nagios		beethoven,backuphost=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-c
 %debian-i18n	ALL=(debian-i18n)	ALL
 %debian-release	ALL=(release)	ALL
 %debtags	ALL=(debtags)	ALL
-%debvoip	cilea=(freeswitch)	ALL
 %debwww		ALL=(debwww)	ALL
 %dedup		ALL=(dedup)	ALL
 %btslink	ALL=(btslink)	ALL