X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2933d23fa81c6517d7e8394c839b8d533e63bfc6;hb=9ed89ed95202c7f1cd5afff59091b80ca2177528;hp=b0bd0f9d68fd99f02247957196234dc61cf7c9b6;hpb=0808e7cdefd89761bee793e373d391ea076ff3de;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b0bd0f9d6..2933d23fa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,17 +45,14 @@ node default {
 	include haveged
 	include huge_mem
 	include tcp_bbr
+	include certregen::client
 
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
+	include roles::pubsub::client
+	class { 'roles::udldap::client':
+		ensure => absent
 	}
 
-	if $::hostname in [byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] {
+	if getfromhash($site::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
@@ -105,6 +102,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }