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 67675ef..ead009c 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,6 +71,9 @@ class roles {
        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
        }
@@ -303,14 +306,23 @@ 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
        }
 
+       if $::hostname in [klecker] {
+               onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
+       }
        if has_role('onionbalance') {
                include onion::balance
        }
+       if has_role('bgp') {
+               include roles::bgp
+       }
+       if has_role('cdimage-search') {
+               include roles::cdimage_search
+       }
 }