From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 10 Feb 2017 20:52:32 +0000 (+0100)
Subject: rename archive_master to historical_master to match _mirror name
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2ebc03ce2726310ca86c1d7178f72b4b1ccfea79;p=mirror%2Fdsa-puppet.git

rename archive_master to historical_master to match _mirror name
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index bcfc62237..bf9a3ebb3 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,8 +4,6 @@ searchpaths: []
 resolvoptions: []
 allow_dns_query: []
 roles:
-  archive_master:
-    - sibelius.debian.org
   bugsmx:
     - buxtehude.debian.org
   bugs_master:
@@ -218,6 +216,8 @@ roles:
   debian_mirror_onion:
     - bilbao.debian.org
     - mirror-isc.debian.org
+  historical_master:
+    - sibelius.debian.org
   historical_mirror:
     - gretchaninov.debian.org
     - klecker.debian.org
diff --git a/modules/roles/manifests/archive_master.pp b/modules/roles/manifests/archive_master.pp
deleted file mode 100644
index a9f32ed5d..000000000
--- a/modules/roles/manifests/archive_master.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class roles::archive_master {
-	$sslname = 'archive-master.debian.org'
-
-	rsync::site_systemd { 'archive_master':
-		source      => 'puppet:///modules/roles/archive_master/rsyncd.conf',
-		max_clients => 100,
-		sslname     => $sslname,
-	}
-
-	ssl::service { $sslname:
-		key      => true,
-		tlsaport => [],
-	}
-}
diff --git a/modules/roles/manifests/historical_master.pp b/modules/roles/manifests/historical_master.pp
new file mode 100644
index 000000000..c0953f17a
--- /dev/null
+++ b/modules/roles/manifests/historical_master.pp
@@ -0,0 +1,14 @@
+class roles::historical_master {
+	$sslname = 'archive-master.debian.org'
+
+	rsync::site_systemd { 'archive_master':
+		source      => 'puppet:///modules/roles/historical_master/rsyncd.conf',
+		max_clients => 100,
+		sslname     => $sslname,
+	}
+
+	ssl::service { $sslname:
+		key      => true,
+		tlsaport => [],
+	}
+}
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ead009c09..45708a262 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,8 +34,8 @@ class roles {
 		include porterbox
 	}
 
-	if has_role('archive_master') {
-		include archive_master
+	if has_role('historical_master') {
+		include historical_master
 	}
 
 	if has_role('bugs_mirror') {