Add new module elasticsearch for listsearch

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5ec93d1..cab8edd 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -30,13 +30,7 @@ class roles {
 
        # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'porterbox') {
-               class {'porterbox':
-                       ensure => present,
-               }
-       } else {
-               class {'porterbox':
-                       ensure => absent,
-               }
+               include porterbox
        }
 
        if has_role('bugs_mirror') {
@@ -59,6 +53,12 @@ class roles {
                include roles::dakmaster
        }
 
+       if has_role('api.ftp-master') {
+               ssl::service { 'api.ftp-master.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
                include roles::security_mirror
@@ -154,6 +154,10 @@ class roles {
                include roles::lists
        }
 
+       if has_role('list_search') {
+               include roles::listsearch
+       }
+
        if has_role('rtmaster') {
                include roles::rtmaster
        }
@@ -229,4 +233,11 @@ class roles {
                        tlsaport => 0,
                }
        }
+
+       if has_role('search_backend') {
+               include search_backend
+       }
+       if has_role('search_frontend') {
+               include search_frontend
+       }
 }