security_master -> hiera role

diff --git a/data/common.yaml b/data/common.yaml
index f5090f2..327884e 100644 (file)
--- 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 (file)
index 0000000..070e138
--- /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 a4445ee..dcf42e0 100644 (file)
--- 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 6dd5fce..c627ac0 100644 (file)
--- 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,