X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9bf2eb83470fd9e6db582c61cdc94c4d1c0eaf64;hb=70ae0a0c23d6d88d6c08e35485a33796e8b948e3;hp=11bf95821f625f6a06c6c624a890d3bfd2e261e6;hpb=6ee2086bdea86dc00c036e481b68ff063b400b6d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 11bf95821..9bf2eb834 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,31 +21,46 @@ Service {
 node default {
 	include site
 	include munin
-	include syslog-ng
+	include syslog_ng
 	include sudo
 	include ssh
-	include debian-org
+	include debian_org
 	include monit
-	include ntp
-	include ntpdate
+	include time
 	include ssl
-	include motd
 	include hardware
 	include nagios::client
 	include resolv
 	include roles
+	include motd
+	include unbound
+	include bacula::client
+	include autofs
+	include dsa_lvm
+	include grub
+	include multipath
+	include popcon
+	include portforwarder
+	include postgres
+	include haveged
+	include huge_mem
+	include tcp_bbr
+
+	if $::lsbdistcodename == squeeze {
+		include roles::udldap::client
+	} else {
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
+		}
+	}
 
-	if $::hostname in [pasquini,tristano] {
+	if getfromhash($site::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
-	} elsif $::kernel == 'GNU/kFreeBSD' {
-		include kfreebsd
-	}
-
-	if $::kvmdomain {
 		include acpi
 	}
 
@@ -55,61 +70,41 @@ node default {
 		} else {
 			include exim
 		}
-	} else {
+	} elsif $::mta == 'postfix' {
 		include postfix
-	}
-
-	if $::lsbdistcodename != 'lenny' {
-		include unbound
+	} else {
+		include exim
 	}
 
 	if $::apache2 {
 		include apache2
 	}
 
-	if $::rsyncd {
-		include rsyncd-log
-	}
-
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
-	} elsif $::hostname == 'liszt' {
-		include named::recursor
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
-		include dacs
-	}
-
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
-		include nfs-server
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+		include nfs_server
 	}
 
 	if $::brokenhosts {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
-	}
-
-	include samhain
-
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
+	if $::samhain {
+		include samhain
 	}
 
-	if ($::postgres84 or $::postgres90) {
-		include postgres
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hostname in [chopin] {
-		include vsftpd
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish_pkgmirror
 	}
 }