retire glinka

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

diff --git a/manifests/site.pp b/manifests/site.pp
index a02ad66..178fc2d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -89,16 +89,14 @@ node default {
        }
 
        if $::apache2 {
-               if !($::hostname in [oyens]) {
-                       include apache2
-               }
+               include apache2
        }
 
        if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
 
-       if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
                include nfs-server
        }
 
@@ -126,10 +124,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hoster {
-               if $::hoster in [ynic] {
-                       include lldp
-               }
+       if $::hostname == 'pkgmirror-csail' {
+               include varnish
        }
 }
-