X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=af7c23d9c73b278aac50d85d2f512996f7cd4654;hb=a45da98df2cbd26ba3496cf3e83771a88b3f4fb2;hp=192c5462e066702b7375caa07283f5e04e3fd06d;hpb=bb15adff411f4c08c116324cb21e3f96e767df1b;p=dsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index 192c5462..af7c23d9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,5 +1,5 @@ Package { - require => [ Exec["apt-get update"], File["/etc/apt/apt.conf.d/local-recommends"] ] + require => File["/etc/apt/apt.conf.d/local-recommends"] } File { @@ -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