mirror_ports -> ports_mirror

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index deaf099..b489b72 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -213,7 +213,7 @@ roles:
   mirror_debug:
     - klecker.debian.org
     - mirror-isc.debian.org
-  mirror_ports:
+  ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
   planet_search:

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a6d6647..be623c9 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -77,9 +77,6 @@ class roles {
        if has_role('mirror_debug') {
                include roles::debug_mirror
        }
-       if has_role('mirror_ports') {
-               include roles::ports_mirror
-       }
 
        if has_role('ftp.d.o') {
                include roles::ftp
@@ -349,6 +346,9 @@ class roles {
        if has_role('ports-master') {
                include roles::ports-master
        }
+       if has_role('ports_mirror') {
+               include roles::ports_mirror
+       }
 
        if $::hostname in [klecker] {
                onion::service { 'ftp.debian.org':