Add support to hashes for has_role

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6b447f9..efde596 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,7 +71,10 @@ class roles {
                include roles::debian_mirror
        }
        if has_role('ftp.d.o') {
-               include roles::ftp
+               vsftpd::site { 'ftp':
+                       ensure  => absent,
+                       root    => '/nonexistent',
+               }
        }
        if has_role('ftp_master') {
                include roles::ftp_master
@@ -99,6 +102,8 @@ class roles {
                include roles::security_master
                include roles::dakmaster
        }
+       $zz = has_role('security_mirror')
+       notice("Has security mirror role? '${zz}'")
        if has_role('security_mirror') {
                include roles::security_mirror
        }
@@ -294,6 +299,9 @@ class roles {
                include roles::debtags
        }
 
+       if has_role('planet_master') {
+               include roles::planet_master
+       }
        if has_role('planet_search') {
                ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
@@ -357,4 +365,16 @@ class roles {
        if has_role('popcon') {
                include roles::popcon
        }
+
+       if has_role('debsources') {
+               include roles::debsources
+       }
+
+       if has_role('ipsec') {
+               include ipsec
+       }
+
+       if has_role('debconf_wafer') {
+               include roles::debconf_wafer
+       }
 }