X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=124c1888e4c5ac3b2e6a905f4d1ce1eed9f32154;hb=a33c8b8a15ffe1c49f19863ca671bf76cdeb80f4;hp=a852abd5b02e07d38a2f9df0936e7e5679c00cdb;hpb=a173e2ae5e6d020b27810fc02b4e6c497af2e67f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a852abd5b..124c1888e 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -57,9 +57,6 @@ class roles {
 	}
 
 	# archive.debian.org
-	if has_role('historical_master') {
-		include historical_master
-	}
 	if has_role('historical_mirror') {
 		include roles::historical_mirror
 	}
@@ -208,6 +205,9 @@ class roles {
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
+	if has_role('piuparts_slave') {
+		include roles::piuparts_slave
+	}
 
 	if has_role('contributors') {
 		include roles::contributors
@@ -244,6 +244,10 @@ class roles {
 		ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
+	if has_role('historicalpackages') {
+		ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+	}
+
 	if has_role('qamaster') {
 		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -257,21 +261,21 @@ class roles {
 	}
 
 	if has_role('search_backend') {
-		include search_backend
+		include roles::search_backend
 	}
 	if has_role('search_frontend') {
-		include search_frontend
+		include roles::search_frontend
 	}
 
 	if has_role('dgit_browse') {
-		include dgit_browse
+		include roles::dgit_browse
 	}
 	if has_role('dgit_git') {
-		include dgit_git
+		include roles::dgit_git
 	}
 
 	if $::hostname in [lw01, lw02, lw03, lw04] {
-		include snapshot
+		include roles::snapshot
 	}
 
 	if has_role('veyepar.debian.org') {
@@ -281,10 +285,6 @@ class roles {
 		ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('httpredir') {
-		include roles::httpredir
-	}
-
 	if has_role('debtags') {
 		include roles::debtags
 	}
@@ -326,4 +326,18 @@ class roles {
 	if has_role('cdimage-search') {
 		include roles::cdimage_search
 	}
+
+	if has_role('postgresql_server') {
+		include roles::postgresql_server
+	}
+
+	if has_role('bacula_director') {
+		include bacula::director
+	} else {
+		package { 'bacula-console': ensure => purged; }
+		file { '/etc/bacula/bconsole.conf': ensure => absent; }
+	}
+	if has_role('bacula_storage') {
+		include bacula::storage
+	}
 }