From 2ebc03ce2726310ca86c1d7178f72b4b1ccfea79 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 10 Feb 2017 21:52:32 +0100
Subject: [PATCH] rename archive_master to historical_master to match _mirror
 name

---
 hieradata/common.yaml                                         | 4 ++--
 .../manifests/{archive_master.pp => historical_master.pp}     | 4 ++--
 modules/roles/manifests/init.pp                               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/roles/manifests/{archive_master.pp => historical_master.pp} (65%)

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/historical_master.pp
similarity index 65%
rename from modules/roles/manifests/archive_master.pp
rename to modules/roles/manifests/historical_master.pp
index a9f32ed5d..c0953f17a 100644
--- a/modules/roles/manifests/archive_master.pp
+++ b/modules/roles/manifests/historical_master.pp
@@ -1,8 +1,8 @@
-class roles::archive_master {
+class roles::historical_master {
 	$sslname = 'archive-master.debian.org'
 
 	rsync::site_systemd { 'archive_master':
-		source      => 'puppet:///modules/roles/archive_master/rsyncd.conf',
+		source      => 'puppet:///modules/roles/historical_master/rsyncd.conf',
 		max_clients => 100,
 		sslname     => $sslname,
 	}
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') {
-- 
2.20.1