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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 88397c055..b64450dfe 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -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') {
@@ -330,4 +330,14 @@ class roles {
 	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
+	}
 }