X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=2464807164bd68d66f36f1566697e836a4935346;hb=bfcd2cf1ea494a37e5c6ce31f6d3cdfc7fd26433;hp=7a733e63fb03018f0ea495733e639639d7029b1f;hpb=0808c559c2a168b04b2e4478d52281a477ef6a03;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7a733e63f..246480716 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -76,6 +76,7 @@ class roles {
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
+		include roles::signing
 	}
 	if has_role('ftp.upload.d.o') {
 		include roles::ftp_upload
@@ -83,6 +84,9 @@ class roles {
 	if has_role('ssh.upload.d.o') {
 		include roles::ssh_upload
 	}
+	if has_role('security_upload') {
+		include roles::security_upload
+	}
 	if has_role('api.ftp-master') {
 		ssl::service { 'api.ftp-master.debian.org':
 			notify  => Exec['service apache2 reload'],
@@ -174,10 +178,6 @@ class roles {
 		include roles::lists
 	}
 
-	if has_role('list_search') {
-		include roles::listsearch
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -225,17 +225,6 @@ class roles {
 		include roles::jenkins
 	}
 
-	if has_role('keystone') {
-		include roles::keystone
-	}
-	if has_role('keystone_rabbitmq') {
-		include roles::keystone::rabbitmq
-	}
-
-	if has_role('memcached') {
-		include roles::memcached
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -244,6 +233,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, }
 	}
@@ -281,10 +274,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
 	}
@@ -330,4 +319,18 @@ 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
+	}
+
+	if $::keyring_debian_org_mirror {
+		include roles::keyring_debian_org_mirror
+	}
 }