No TLSA for qa.debian.org for a while

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3227a6e..df8e39d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -64,19 +64,24 @@ class roles {
                }
        }
 
-       # XXX: turn this into a real role
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-               include roles::security_mirror
+       if has_role('manpages') {
+               ssl::service { 'manpages.debian.org':
+                       notify => Service['apache2'],
+                       key => true,
+               }
        }
 
        # XXX: turn this into a real role
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               include roles::www_mirror
+       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+               include roles::security_mirror
        }
 
        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
@@ -244,25 +249,29 @@ class roles {
        if has_role('packages') {
                ssl::service { 'packages.debian.org':
                        notify => Service['apache2'],
-                       tlsaport => [],
+                       key => true,
                }
        }
 
        if has_role('qamaster') {
                ssl::service { 'qa.debian.org':
                        notify => Service['apache2'],
+                       tlsaport => [],
                }
        }
 
        if has_role('packagesqamaster') {
                ssl::service { 'packages.qa.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
        if has_role('gobby_debian_org') {
                ssl::service { 'gobby.debian.org':
                        notify => Service['apache2'],
+                       key => true,
+                       tlsaport => [443, 6523],
                }
        }
 
@@ -336,4 +345,8 @@ class roles {
                        key => true,
                }
        }
+
+       if has_role('ports-master') {
+               include roles::ports-master
+       }
 }