no more lenny

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 75bac4cca95810089d3ccb6bd8a4abb70b580fd6..593be680be55db2c9dfe30b20012faf539f6ee2f 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,6 +33,7 @@ node default {
        include hardware
        include nagios::client
        include resolv
+       include roles
 
        if $::hostname in [pasquini,tristano] {
                include ganeti2
@@ -54,49 +55,11 @@ node default {
                } else {
                        include exim
                }
-       } elsif $::hostname == 'bendel' {
+       } else {
                include postfix
        }
 
-       if $::lsbdistcodename != 'lenny' {
-               include unbound
-       }
-
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
-               include puppetmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'muninmaster') {
-               include munin::master
-       }
-
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
-
-       if getfromhash($site::nodeinfo, 'buildd') {
-               include buildd
-       }
-
-       if $::hostname in [chopin,franck,morricone,bizet] {
-               include roles::dakmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-               include roles::security_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               include roles::www_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
-       }
+       include unbound
 
        if $::apache2 {
                include apache2
@@ -110,8 +73,6 @@ node default {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
                include named::geodns
-       } elsif $::hostname == 'liszt' {
-               include named::recursor
        }
 
        if $::hostname in [diabelli,nono,spohr] {
@@ -143,8 +104,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
-
-       if $::hostname in [chopin,franck,kassia,klecker,morricone,ravel,bizet] {
-               include vsftpd
-       }
 }