From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 10:42:11 +0000 (+0200)
Subject: security_master -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=06b84d9806c855df88bead1c7ea648301351847e

security_master -> hiera role
---

diff --git a/data/common.yaml b/data/common.yaml
index f5090f255..327884e55 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -63,9 +63,6 @@ roles:
   nagiosmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - tchaikovsky.debian.org
-  security_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - seger.debian.org
   security_mirror:
     # XXX used also in ferm me.conf.erb
     mirror-anu.debian.org:
diff --git a/data/nodes/seger.debian.org.yaml b/data/nodes/seger.debian.org.yaml
new file mode 100644
index 000000000..070e13860
--- /dev/null
+++ b/data/nodes/seger.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::security_master
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a4445ee9b..dcf42e04c 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,12 +34,6 @@ class roles {
 		include roles::dakmaster
 		include roles::signing
 	}
-	#
-	# security.debian.org
-	if has_role('security_master') {
-		include roles::security_master
-		include roles::dakmaster
-	}
 
 	if has_role('security_mirror') {
 		include roles::security_mirror
diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6dd5fce67..c627ac0f7 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,4 +1,6 @@
 class roles::security_master {
+  include roles::dakmaster
+
   ssl::service { 'security-master.debian.org':
     notify   => Exec['service apache2 reload'],
     key      => true,