X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f3e19addc9ce4c5e7386cf656e97fb38a1dc3cb5;hb=ff2190d8b5ad375392ac3dd289a1505cfddcdf80;hp=2e636b58eac4133222c5d7e8b155aa5bf4fe37ef;hpb=286d653b921ffe7927e7db247b186663e9fa9c05;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 2e636b58e..f3e19addc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,9 +19,12 @@ node default {
     include debian-org
     include monit
     include samhain
+    include apt-keys
 
     $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
+    include motd
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
@@ -36,11 +39,9 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
-                      include motd::new
         }
         default: {
 		      include nagios::client
-                      include motd
 	}
     }