no more lenny

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c714a5c3e0cdb23840ec384ba1e7322f959aaef..593be680be55db2c9dfe30b20012faf539f6ee2f 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 Package {
-       require => File['/etc/apt/apt.conf.d/local-recommends'],
-       stage   => deploy_infra
+       require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
@@ -60,9 +59,7 @@ node default {
                include postfix
        }
 
-       if $::lsbdistcodename != 'lenny' {
-               include unbound
-       }
+       include unbound
 
        if $::apache2 {
                include apache2
@@ -76,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] {
@@ -109,8 +104,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
-
-       if $::hostname in [chopin,franck,ravel] {
-               include vsftpd
-       }
 }