From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Sep 2009 23:11:52 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0f7bdd57ac350637b57a7985878439c0fa0c0a08;hp=23439f94c57487b7ef4227c4330a221f26c2b72e;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  path
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 8331d5030..af7c23d9c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,6 +14,8 @@ Exec {
 }
 
 node default {
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
     include munin-node
     include sudo
     include ssh
@@ -21,8 +23,6 @@ node default {
     include monit
     include apt-keys
 
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-
     include motd
     include samhain