Add manpages

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6f39975..168b6f2 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -33,6 +33,10 @@ class roles {
                include porterbox
        }
 
+       if has_role('archive_master') {
+               include archive_master
+       }
+
        if has_role('bugs_mirror') {
                include roles::bugs_mirror
        }
@@ -45,6 +49,7 @@ class roles {
        if has_role('bugs_master') {
                ssl::service { 'bugs-master.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -59,14 +64,15 @@ 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'],
+               }
        }
 
        # 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') {
@@ -239,6 +245,7 @@ class roles {
        if has_role('packages') {
                ssl::service { 'packages.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }