rename archive_master to historical_master to match _mirror name

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index bcfc622..bf9a3eb 100644 (file)
--- 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 (file)
index a9f32ed..0000000
--- 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 (file)
index 0000000..c0953f1
--- /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 ead009c..45708a2 100644 (file)
--- 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') {