X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f4494e6b00d55236dac01c9d3500dd6bb1b3d1c0;hb=989de3f4bfee6e864f34e915a4773360f6e7492a;hp=8162575473449842577b6b02400c2432eeccd218;hpb=0ac9b4ec2a337bdf9ab31c22ba29580532570bb8;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 816257547..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' {
@@ -107,6 +105,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }