historical_master -> hiera role

diff --git a/data/common.yaml b/data/common.yaml
index 1efdd76..fd6328b 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -125,9 +125,6 @@ roles:
         - '[2a02:16a8:dc41:100::232]:80'
       fastly-backend: true
       service-hostname: conova.debian.backend.mirrors.debian.org
-  historical_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - sibelius.debian.org
   historical_mirror:
     # XXX used also in ferm me.conf.erb
     - gretchaninov.debian.org

diff --git a/data/nodes/sibelius.debian.org.yaml b/data/nodes/sibelius.debian.org.yaml
index 0142973..bf38f67 100644 (file)
--- a/data/nodes/sibelius.debian.org.yaml
+++ b/data/nodes/sibelius.debian.org.yaml
@@ -1,3 +1,5 @@
 ---
 classes:
   - roles::historical_master
+
+roles::historical_mirror::sslname: archive-master.debian.org

diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index 4ef3af0..101ecae 100644 (file)
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -1,4 +1,8 @@
-class roles::historical_mirror {
+# a mirror for archive.debian.org
+# @param sslname provide rsync via ssl as well
+class roles::historical_mirror(
+  Optional[String] $sslname = undef,
+){
   include roles::archvsync_base
   include apache2::expires
 
@@ -22,14 +26,11 @@ class roles::historical_mirror {
     content => template('roles/apache-archive.debian.org.erb'),
   }
 
-  if has_role('historical_master') {
-    $sslname = 'archive-master.debian.org'
+  if $sslname {
     ssl::service { $sslname:
       key      => true,
       tlsaport => [],
     }
-  } else {
-    $sslname = undef
   }
 
   rsync::site { 'archive':