roles: make use of porterbox uninstall features

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6c794b68315aab8e8df6a71d8e7bf768be80cd61..063a748e4954aa1f02540037839fce8aac96f6f1 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -31,6 +31,14 @@ class roles {
        # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'porterbox') {
                include porterbox
+               class {'porterbox':
+                       ensure => present,
+               }
+       } else {
+               include porterbox
+               class {'porterbox':
+                       ensure => absent,
+               }
        }
 
        if has_role('bugs_mirror') {
@@ -75,6 +83,12 @@ class roles {
                include roles::git_master
        }
 
+       if has_role('people') {
+               ssl::service { 'people.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        if has_role('security_master') {
                include roles::security_master
                include roles::dakmaster
@@ -162,6 +176,10 @@ class roles {
                include roles::buildd_master
        }
 
+       if has_role('buildd_ports_master') {
+               include roles::buildd_ports_master
+       }
+
        if has_role('piuparts') {
                include roles::piuparts
        }
@@ -196,6 +214,18 @@ class roles {
                }
        }
 
+       if has_role('qamaster') {
+               ssl::service { 'qa.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('packagesqamaster') {
+               ssl::service { 'packages.qa.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        if has_role('gobby_debian_org') {
                ssl::service { 'gobby.debian.org':
                        tlsaport => 0,