X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f4494e6b00d55236dac01c9d3500dd6bb1b3d1c0;hb=cf928c1ad5a2d7666669a3697c4431c0b0a2fe2c;hp=80190d3cdd8c008819f170b9e2af6e726e712281;hpb=95072525773d3ead4ac53220475f1f1d59ff2f84;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 80190d3cd..f4494e6b0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -62,8 +62,6 @@ node default {
 	if $::kernel == 'Linux' {
 		include linux
 		include acpi
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
@@ -86,7 +84,7 @@ node default {
 		include named::geodns
 	}
 
-	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov,sibelius] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}
 
@@ -107,6 +105,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }