X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=2f9dc69419e28e940713f1bd452860da39dabba1;hb=b6527ce00278fa0b57893dd148768f0b0481ad3a;hp=8fe1dafaf7019f977b9b1f28516b3aa954c72c4e;hpb=d2291529368816f55caaf1179fd75c6d56e35938;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp
index 8fe1dafaf..2f9dc6941 100644
--- a/modules/site/manifests/init.pp
+++ b/modules/site/manifests/init.pp
@@ -1,17 +1,13 @@
 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')
+        $roles = hiera('roles')
 
 	service { 'procps':
 		hasstatus   => false,
 		status      => '/bin/true',
 	}
 
-	file { '/etc/sysctl.d/':
-		ensure => directory,
-		mode   => '0755'
-	}
-
 }