Merge remote-tracking branch 'waldi/rsync-systemd-master'

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a6e0965..ead009c 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -20,6 +20,7 @@ class roles {
        #       include nagios::server
                ssl::service { 'nagios.debian.org':
                        notify  => Exec['service apache2 reload'],
+                       key => true,
                }
        }
 
@@ -44,6 +45,7 @@ class roles {
        if has_role('bugs_base') {
                ssl::service { 'bugs.debian.org':
                        notify  => Exec['service apache2 reload'],
+                       key => true,
                }
        }
        if has_role('bugs_master') {
@@ -58,17 +60,23 @@ class roles {
        if has_role('api.ftp-master') {
                ssl::service { 'api.ftp-master.debian.org':
                        notify  => Exec['service apache2 reload'],
-                       tlsaport => 0,
+                       key => true,
                }
        }
 
-       if has_role('manpages') {
-               ssl::service { 'manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+       if has_role('manpages-dyn') {
+               include roles::manpages_dyn
        }
 
        if has_role('security_mirror') {
                include roles::security_mirror
        }
+       if has_role('historical_mirror') {
+               include roles::historical_mirror
+       }
+       if has_role('debian_mirror') {
+               include roles::debian_mirror
+       }
        if has_role('debug_mirror') {
                include roles::debug_mirror
        }
@@ -205,10 +213,6 @@ class roles {
                include roles::nm
        }
 
-       if has_role('release') {
-               include roles::release
-       }
-
        if has_role('rtc') {
                include roles::rtc
        }
@@ -269,6 +273,9 @@ class roles {
        if has_role('veyepar.debian.org') {
                ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
+       if has_role('sreview.debian.org') {
+               ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+       }
 
        if has_role('httpredir') {
                include roles::httpredir
@@ -299,8 +306,8 @@ class roles {
                ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       if has_role('ports-master') {
-               include roles::ports-master
+       if has_role('ports_master') {
+               include roles::ports_master
        }
        if has_role('ports_mirror') {
                include roles::ports_mirror
@@ -312,4 +319,10 @@ class roles {
        if has_role('onionbalance') {
                include onion::balance
        }
+       if has_role('bgp') {
+               include roles::bgp
+       }
+       if has_role('cdimage-search') {
+               include roles::cdimage_search
+       }
 }