Try to avoid reserved site keyword

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c1cdd53..6ff112d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,6 +19,10 @@ Service {
 }
 
 node default {
+       # 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')
@@ -28,7 +32,7 @@ node default {
                ensure => absent
        }
 
-       if getfromhash($site::nodeinfo, 'ganeti') {
+       if getfromhash($deprecated::nodeinfo, 'ganeti') {
                include ganeti2
        }
 
@@ -38,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