use weblog_provider role

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 331aa118014b7f35b610adac3ac25c5882c3617e..cc1d521237c6fce5a1c47372c72b1256110e9061 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -14,10 +14,6 @@ class roles {
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
-       } else {
-               class { 'buildd':
-                       ensure => absent
-               }
        }
 
        if getfromhash($site::nodeinfo, 'bugs_mirror') {
@@ -37,10 +33,6 @@ class roles {
                include roles::www_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
        if getfromhash($site::nodeinfo, 'ftp.d.o') {
                include roles::ftp
        }
@@ -49,11 +41,6 @@ class roles {
                include roles::ftp_upload
        }
 
-       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
@@ -80,4 +67,8 @@ class roles {
        } elsif getfromhash($site::nodeinfo, 'static_source') {
                include roles::static_source
        }
+
+       if getfromhash($site::nodeinfo, 'weblog_provider') {
+               include roles::weblog_provider
+       }
 }