From 8a7c94c49272582f3e14030467e907894f7996e7 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 15:29:07 +0200
Subject: [PATCH] search_{frontend,backend} -> hiera role; explicitly include
 apache2

---
 hieradata/common.yaml                        |  4 ----
 hieradata/nodes/cgi-grnet-01.debian.org.yaml |  2 ++
 hieradata/nodes/wolkenstein.debian.org.yaml  |  2 ++
 modules/roles/manifests/init.pp              |  7 -------
 modules/roles/manifests/search_frontend.pp   | 10 ++++++----
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 916a4b365..c811609de 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -84,10 +84,6 @@ roles:
     - quantz.debian.org
   rtmaster:
     - reger.debian.org
-  search_backend:
-    - wolkenstein.debian.org
-  search_frontend:
-    - cgi-grnet-01.debian.org
   security_master:
     - seger.debian.org
   security_mirror:
diff --git a/hieradata/nodes/cgi-grnet-01.debian.org.yaml b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
index fb3c65174..7cd1ffc1c 100644
--- a/hieradata/nodes/cgi-grnet-01.debian.org.yaml
+++ b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
@@ -1,2 +1,4 @@
+---
 classes:
   - roles::anonscm
+  - roles::search_frontend
diff --git a/hieradata/nodes/wolkenstein.debian.org.yaml b/hieradata/nodes/wolkenstein.debian.org.yaml
index f1704b5f0..2061247e6 100644
--- a/hieradata/nodes/wolkenstein.debian.org.yaml
+++ b/hieradata/nodes/wolkenstein.debian.org.yaml
@@ -1,3 +1,5 @@
+---
 classes:
+  - roles::search_backend
   - roles::static_source
   - roles::weblog_destination
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1c4dc9d53..ae90e56fd 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -154,13 +154,6 @@ class roles {
 		}
 	}
 
-	if has_role('search_backend') {
-		include roles::search_backend
-	}
-	if has_role('search_frontend') {
-		include roles::search_frontend
-	}
-
 	if has_role('dgit_browse') {
 		include roles::dgit_browse
 	}
diff --git a/modules/roles/manifests/search_frontend.pp b/modules/roles/manifests/search_frontend.pp
index dc1861db5..c77e901a6 100644
--- a/modules/roles/manifests/search_frontend.pp
+++ b/modules/roles/manifests/search_frontend.pp
@@ -1,6 +1,8 @@
 class roles::search_frontend {
-	ssl::service { 'search.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  include apache2
+
+  ssl::service { 'search.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }
-- 
2.20.1