X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=dc9b9479b999ee41f947a79f60130fdc2f2e2714;hb=c7afa6d04e06776ac94206451153d6c0c0572495;hp=6ed7fc51d02151357a12c3f90a02289036b4ca34;hpb=0134050ffdc3dcf9f371f123dea0c37f4dd28010;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp
index 6ed7fc51d..dc9b9479b 100644
--- a/modules/site/manifests/init.pp
+++ b/modules/site/manifests/init.pp
@@ -1,14 +1,7 @@
 class site {
 
-	$localinfo = yamlinfo('*', '/etc/puppet/modules/debian-org/misc/local.yaml')
-	$nodeinfo  = nodeinfo($::fqdn, '/etc/puppet/modules/debian-org/misc/local.yaml')
+	$localinfo = yamlinfo('*')
+	$nodeinfo  = nodeinfo($::fqdn)
 	$allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
-	notice( sprintf('hoster for %s is %s', $::fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
-	notice( sprintf('facter hoster for %s is %s', $::fqdn, $::hoster) )
-	notice( sprintf('hiera resolver for %s is %s', $::fqdn, hiera('nameservers') ) )
-
-	service { 'procps':
-		hasstatus   => false,
-		status      => '/bin/true',
-	}
+        $roles = hiera('roles')
 }