add keyring

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 137cd75e4da7b839b08172ae00a21e4f35cd4967..a8f745ab1dddcb2596c3cce4311a239c6acf4efc 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,7 +16,12 @@ class roles {
                include buildd
        }
 
-       if $::hostname in [chopin,franck,morricone,bizet] {
+       if getfromhash($site::nodeinfo, 'bugs_search') {
+               include roles::bugs_search
+       }
+
+       if getfromhash($site::nodeinfo, 'ftp_master') {
+               include roles::ftp_master
                include roles::dakmaster
        }
 
@@ -40,8 +45,22 @@ class roles {
                include roles::ftp_upload
        }
 
-       if $::hostname in [bizet,morricone] {
+       if getfromhash($site::nodeinfo, 'backports_master') {
                include roles::backports_master
+               include roles::dakmaster
+       }
+
+       if getfromhash($site::nodeinfo, 'security_master') {
+               include roles::security_master
+               include roles::dakmaster
+       }
+
+       if getfromhash($site::nodeinfo, 'www_master') {
+               include roles::www_master
+       }
+
+       if getfromhash($site::nodeinfo, 'keyring') {
+               include roles::keyring
        }
 
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {