search_{frontend,backend} -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 916a4b3..c811609 100644 (file)
--- 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 fb3c651..7cd1ffc 100644 (file)
--- 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 f1704b5..2061247 100644 (file)
--- 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 1c4dc9d..ae90e56 100644 (file)
--- 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 dc1861d..c77e901 100644 (file)
--- 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,
+  }
 }