Try to avoid reserved site keyword

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9bf2eb8..6ff112d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,43 +19,20 @@ Service {
 }
 
 node default {
-       include site
-       include munin
-       include syslog_ng
-       include sudo
-       include ssh
-       include debian_org
-       include monit
-       include time
-       include ssl
-       include hardware
-       include nagios::client
-       include resolv
-       include roles
-       include motd
-       include unbound
-       include bacula::client
-       include autofs
-       include dsa_lvm
-       include grub
-       include multipath
-       include popcon
-       include portforwarder
-       include postgres
-       include haveged
-       include huge_mem
-       include tcp_bbr
-
-       if $::lsbdistcodename == squeeze {
-               include roles::udldap::client
-       } else {
-               include roles::pubsub::client
-               class { 'roles::udldap::client':
-                       ensure => absent
-               }
+       # we really should rename this one
+       include deprecated
+       include base
+
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
+
+       include roles::pubsub::client
+       class { 'roles::udldap::client':
+               ensure => absent
        }
 
-       if getfromhash($site::nodeinfo, 'ganeti') {
+       if getfromhash($deprecated::nodeinfo, 'ganeti') {
                include ganeti2
        }
 
@@ -65,7 +42,7 @@ node default {
        }
 
        if $::mta == 'exim4' {
-               if getfromhash($site::nodeinfo, 'heavy_exim') {
+               if getfromhash($deprecated::nodeinfo, 'heavy_exim') {
                        include exim::mx
                } else {
                        include exim
@@ -80,10 +57,6 @@ node default {
                include apache2
        }
 
-       if $::hostname in [geo1,geo2,geo3] {
-               include named::geodns
-       }
-
        if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
                include nfs_server
        }