From 8f8949635232414cd22ed6e413f9c8aff4c5f306 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 14 Jan 2014 18:43:49 +0100
Subject: [PATCH] remove grieg (RT#4393)
---
modules/debian-org/misc/local.yaml | 3 ---
modules/exim/templates/manualroute.erb | 2 +-
modules/exim/templates/virtualdomains.erb | 1 -
modules/ferm/manifests/per-host.pp | 11 -----------
modules/ferm/templates/defs.conf.erb | 1 -
.../obsolete-packages-ignore.d-hostspecific.erb | 1 -
modules/sudo/files/sudoers | 4 ++--
7 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 2e874932..546e2368 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -57,7 +57,6 @@ nameinfo:
glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
gombert.debian.org: Nicolas Gombert (c. 1495 â c. 1560)
- grieg.debian.org: Edvard Hagerup Grieg (June 15th, 1843 - September 4th, 1907)
handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973)
hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783)
@@ -159,7 +158,6 @@ host_settings:
- draghi.debian.org
- franck.debian.org
- gombert.debian.org
- - grieg.debian.org
- mailly.debian.org
- master.debian.org
- muffat.debian.org
@@ -307,5 +305,4 @@ host_settings:
- rautavaara.debian.org
- salieri.debian.org
buildd_master:
- - grieg.debian.org
- wuiet.debian.org
diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 899f1d99..3522f84d 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,7 +5,7 @@
## Format:
## domain: hostname[::port] options
## example:
-## buildd.debian.org: grieg.debian.org::587 byname
+## buildd.debian.org: foobar.debian.org::587 byname
<%=
mxmatches = [ @fqdn ]
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index dc735829..ea19a748 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -12,7 +12,6 @@ ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp-master.debian.
when "gombert.debian.org" then "gobby.debian.org: user=gobby group=gobby directory=/srv/gobby.debian.org/mail"
- when "grieg.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
when "wuiet.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail"
#logs.buildd.debian.org: user=wbadm group=wbadm directory=/srv/logs.buildd.debian.org/mail"
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 818c2aaa..7d257771 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -223,17 +223,6 @@ class ferm::per-host {
rule => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
}
}
- grieg: {
- @ferm::rule { 'dsa-postgres-ullmann':
- description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.141/32 ))'
- }
- @ferm::rule { 'dsa-postgres-ullmann6':
- domain => '(ip6)',
- description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))'
- }
- }
franck: {
@ferm::rule { 'dsa-postgres-franck':
description => 'Allow postgress access',
diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 49c6eedc..2ae5b8c9 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -130,7 +130,6 @@
@def $USER_joerg6 = ($USER_joerg6 2a01:4f8:131:1520::6667);
@def $BUILDD_SSH_ACCESS = ();
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 194.177.211.200); # grieg
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel
diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 5d623e32..9e700b22 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -18,7 +18,6 @@ when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/ then ignore << %w{flas
when /harris.debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
when /(hasse|hebden|henze|hildegard|howells|hummel|hoiby).debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
when /(parry|partch).debian.org/ then ignore << "yaboot"
-when "grieg.debian.org" then ignore << %w{dpkg}
when "blavet.debian.org" then ignore << %w{dpkg-dev libdpkg-perl dpkg}
when "handel.debian.org" then ignore << %w{puppet-dashboard}
when "reger.debian.org" then ignore << %w{librt-extension-commandbymail-perl}
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 0dda71b2..724cd87f 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -28,11 +28,11 @@ Host_Alias SECHOSTS = chopin
Host_Alias FTPHOSTS = franck
Host_Alias ZIVITHOSTS = zelenka, zandonai
Host_Alias AACRAIDHOSTS = paganini, respighi, beethoven, pettersson
-Host_Alias MEGARAIDHOSTS = grieg, rautavaara, sibelius
+Host_Alias MEGARAIDHOSTS = rautavaara, sibelius
Host_Alias MPTRAIDHOSTS = barber, biber, cilea, vitry, orff
Host_Alias MEGACTLHOSTS = nielsen
Host_Alias LISTHOSTS = bendel
-Host_Alias BUILDD_MASTER = grieg, wuiet
+Host_Alias BUILDD_MASTER = wuiet
Host_Alias PORTERBOXES = abel, agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka
Host_Alias PIUPARTS_SLAVE_HOSTS = piu-slave-bm-a
--
2.39.5