From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 10 Feb 2017 20:54:51 +0000 (+0100)
Subject: just move roles around to group things by service.  should be no real changes
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=648cddfcd23cee082395ee8f5caba7be151c71d3;p=mirror%2Fdsa-puppet.git

just move roles around to group things by service.  should be no real changes
---

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 45708a262..f8d04d1c3 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,10 +34,6 @@ class roles {
 		include porterbox
 	}
 
-	if has_role('historical_master') {
-		include historical_master
-	}
-
 	if has_role('bugs_mirror') {
 		include roles::bugs_mirror
 	}
@@ -52,46 +48,55 @@ class roles {
 		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('ftp_master') {
-		include roles::ftp_master
-		include roles::dakmaster
-	}
-
-	if has_role('api.ftp-master') {
-		ssl::service { 'api.ftp-master.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
-	}
-
 	if has_role('manpages-dyn') {
 		include roles::manpages_dyn
 	}
 
-	if has_role('security_mirror') {
-		include roles::security_mirror
+	# archive.debian.org
+	if has_role('historical_master') {
+		include historical_master
 	}
 	if has_role('historical_mirror') {
 		include roles::historical_mirror
 	}
-	if has_role('debian_mirror') {
-		include roles::debian_mirror
-	}
+
+	# debug archive
 	if has_role('debug_mirror') {
 		include roles::debug_mirror
 	}
 
+	# ftp.debian.org and its ecosystem
+	if has_role('debian_mirror') {
+		include roles::debian_mirror
+	}
 	if has_role('ftp.d.o') {
 		include roles::ftp
 	}
-
+	if has_role('ftp_master') {
+		include roles::ftp_master
+		include roles::dakmaster
+	}
 	if has_role('ftp.upload.d.o') {
 		include roles::ftp_upload
 	}
-
 	if has_role('ssh.upload.d.o') {
 		include roles::ssh_upload
 	}
+	if has_role('api.ftp-master') {
+		ssl::service { 'api.ftp-master.debian.org':
+			notify  => Exec['service apache2 reload'],
+			key => true,
+		}
+	}
+	#
+	# security.debian.org
+	if has_role('security_master') {
+		include roles::security_master
+		include roles::dakmaster
+	}
+	if has_role('security_mirror') {
+		include roles::security_mirror
+	}
 
 	if has_role('git_master') {
 		include roles::git_master
@@ -102,11 +107,6 @@ class roles {
 		onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
 	}
 
-	if has_role('security_master') {
-		include roles::security_master
-		include roles::dakmaster
-	}
-
 	if has_role('www_master') {
 		include roles::www_master
 	}