From d56ca7cb70039b036d91f93cfb33cb1fb7743e82 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 12 Feb 2014 09:31:21 +0100
Subject: [PATCH] retire paganini (RT#4407)

---
 modules/debian-org/misc/local.yaml             |  1 -
 modules/ferm/manifests/per-host.pp             | 10 ----------
 modules/sudo/files/sudoers                     |  2 +-
 modules/syslog-ng/templates/syslog-ng.conf.erb |  5 -----
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 546e2368..57fd6d16 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -85,7 +85,6 @@ nameinfo:
   nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
   nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
   orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
-  paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
   parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
   pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index a72b9121..6f8b4186 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -38,16 +38,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(udp, 69)'
 			}
 		}
-		#paganini: {
-		#	@ferm::rule { 'dsa-dhcp':
-		#		description     => 'Allow dhcp access',
-		#		rule            => '&SERVICE(udp, 67)'
-		#	}
-		#	@ferm::rule { 'dsa-tftp':
-		#		description     => 'Allow tftp access',
-		#		rule            => '&SERVICE(udp, 69)'
-		#	}
-		#}
 		lotti,lully: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 5cf49676..9058d679 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -27,7 +27,7 @@ Host_Alias	WEBHOSTS	= wolkenstein
 Host_Alias	SECHOSTS	= chopin
 Host_Alias	FTPHOSTS	= franck
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
-Host_Alias	AACRAIDHOSTS	= paganini, respighi, beethoven, pettersson
+Host_Alias	AACRAIDHOSTS	= respighi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= rautavaara, sibelius
 Host_Alias	MPTRAIDHOSTS	= barber, biber, cilea, vitry, orff
 Host_Alias	MEGACTLHOSTS	= nielsen
diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 53ce00d6..546bf1cb 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -117,11 +117,6 @@ source s_local {
         # messages from the kernel
         file("/dev/klog" program_override("kernel: ") follow-freq(1));
 <%- end -%>
-<%- if hostname == "paganini" -%>
-        # use the following line if you want to receive remote UDP logging messages
-        # (this is equivalent to the "-r" syslogd flag)
-        udp();
-<%- end -%>
 };
 
 <%- if (hostname == "lotti") || (hostname == "lully") -%>
-- 
2.39.2