New ipv6 addresses for klecker

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 88397c0..124c188 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -244,6 +244,10 @@ class roles {
                ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
+       if has_role('historicalpackages') {
+               ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+       }
+
        if has_role('qamaster') {
                ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
@@ -257,21 +261,21 @@ class roles {
        }
 
        if has_role('search_backend') {
-               include search_backend
+               include roles::search_backend
        }
        if has_role('search_frontend') {
-               include search_frontend
+               include roles::search_frontend
        }
 
        if has_role('dgit_browse') {
-               include dgit_browse
+               include roles::dgit_browse
        }
        if has_role('dgit_git') {
-               include dgit_git
+               include roles::dgit_git
        }
 
        if $::hostname in [lw01, lw02, lw03, lw04] {
-               include snapshot
+               include roles::snapshot
        }
 
        if has_role('veyepar.debian.org') {
@@ -281,10 +285,6 @@ class roles {
                ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       if has_role('httpredir') {
-               include roles::httpredir
-       }
-
        if has_role('debtags') {
                include roles::debtags
        }
@@ -330,4 +330,14 @@ class roles {
        if has_role('postgresql_server') {
                include roles::postgresql_server
        }
+
+       if has_role('bacula_director') {
+               include bacula::director
+       } else {
+               package { 'bacula-console': ensure => purged; }
+               file { '/etc/bacula/bconsole.conf': ensure => absent; }
+       }
+       if has_role('bacula_storage') {
+               include bacula::storage
+       }
 }