X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=e8e980140f4e9cdac759deca2337a6825ed208d5;hb=a6e9ddda8cc6bd47ef8324c92cd9012cf6d6df82;hp=7a733e63fb03018f0ea495733e639639d7029b1f;hpb=32ea1e350d8b71c35b3147aa437a6f7ac1b3d650;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7a733e63f..e8e980140 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -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, }
 	}
@@ -330,4 +334,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
+	}
 }