X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=b64450dfedf4c9eb3eb63c4112ef34608a776f4c;hb=71a60ee9dcabd1eee84c55092fac7826e4142459;hp=67456f83aeccb9db50faca1e8c31a04eb38b67a3;hpb=f4787cc4e7d41c84896c50ff1f26f1767a7acb4e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 67456f83a..b64450dfe 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
@@ -257,21 +257,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') {
@@ -317,9 +317,6 @@ class roles {
 		include roles::ports_mirror
 	}
 
-	if $::hostname in [klecker] {
-		onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
-	}
 	if has_role('onionbalance') {
 		include onion::balance
 	}
@@ -329,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
+	}
 }