From e3bebd85cddff77d74c2015315f1baf2d2977ed2 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 26 Aug 2017 14:45:46 +0200
Subject: [PATCH] Retire stockhausen/listsearch (RT#6848)

---
 hieradata/common.yaml                    |  2 --
 modules/debian_org/files/misc/local.yaml |  1 -
 modules/ferm/manifests/per_host.pp       | 16 ----------------
 modules/roles/manifests/init.pp          |  4 ----
 modules/roles/manifests/listsearch.pp    | 13 -------------
 modules/sudo/files/sudoers               |  1 -
 6 files changed, 37 deletions(-)
 delete mode 100644 modules/roles/manifests/listsearch.pp

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7c787bcf3..7dd938dd0 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -57,8 +57,6 @@ roles:
     - rapoport.debian.org
   lists:
     - bendel.debian.org
-  list_search:
-    - stockhausen.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index c57430b69..3812700c3 100644
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -95,7 +95,6 @@ nameinfo:
   sonntag.debian.org: Brunhilde Sonntag (September 27th, 1936 - December 18th, 2002)
   sor.debian.org: Fernando Sor (February 14th, 1778 - July 10th, 1839)
   soriano.debian.org: Francesco Soriano (1548 or 1549 - July 19th, 1621)
-  stockhausen.debian.org: Karlheinz Stockhausen (August 22nd, 1928 - December 5th, 2007)
   storace.debian.org: Stephen Storace (April 4th, 1762 - March 19th, 1796)
   suchon.debian.org: Eugen Suchoň (September 25, 1908 - August 5, 1993)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 6b4fceadc..3118efc21 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -156,22 +156,6 @@ class ferm::per_host {
 		default: {}
 	}
 
-	# elasticsearch stuff
-	case $::hostname {
-		stockhausen: {
-			@ferm::rule { 'dsa-elasticsearch-bendel':
-				domain          => '(ip)',
-				description     => 'Allow elasticsearch access from bendel',
-				rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 82.195.75.100/32 ))'
-			}
-			@ferm::rule { 'dsa-elasticsearch-bendel6':
-				domain          => '(ip6)',
-				description     => 'Allow elasticsearch access from bendel',
-				rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 2001:41b8:202:deb:216:36ff:fe40:4002/128 ))'
-			}
-		}
-	}
-
 	# postgres stuff
 	case $::hostname {
 		ullmann: {
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d486e0477..a224a1d84 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -175,10 +175,6 @@ class roles {
 		include roles::lists
 	}
 
-	if has_role('list_search') {
-		include roles::listsearch
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
diff --git a/modules/roles/manifests/listsearch.pp b/modules/roles/manifests/listsearch.pp
deleted file mode 100644
index fa818179c..000000000
--- a/modules/roles/manifests/listsearch.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class roles::listsearch {
-
-  class { 'elasticsearch':
-    autoupgrade => false,
-    config => { 'cluster.name' => 'listsearch' }
-  }
-
- # elasticsearch::instance { 'es-01':
- #   config => { 'node.name' => 'stockhausen' },
- #   init_defaults => { }, # Init defaults hash
- #   datadir => [ '/srv/listsearch.debian.org/es-data-es01' ],       # Data directory
- # }
-}
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index d9545abdc..8aa9422c0 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -249,7 +249,6 @@ debwww		WEBHOSTS=(archvsync)	NOPASSWD: /home/archvsync/webmirrors/runmirrors
 %d-i		WEBHOSTS=(debwww)	/srv/www.debian.org/cron/lessoften-parts/1installation-guide
 # more list stuff
 %list		LISTHOSTS=(root)		/usr/sbin/postfix reload
-%list		stockhausen=(root)		/usr/sbin/service jetty restart
 %list		LISTHOSTS=(root)		/usr/sbin/qshape, /usr/sbin/postsuper
 %list		LISTHOSTS=(root)		/etc/init.d/spamassassin, /etc/init.d/amavis
 %list		LISTHOSTS=(amavis)		NOPASSWD: /usr/bin/sa-learn
-- 
2.20.1