X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8e72e7d335283d6de4fd39382288af6b3cb81ed4;hb=84d0b284fff6d91fc155705191408c8901719ab2;hp=9b6d45ba715e2bbc2a9defb0ebeeabf2eeed79a8;hpb=6b1461d0ec2d6470003a69e33517e6d231253d81;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b6d45ba7..8e72e7d33 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,13 +21,12 @@ 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 hardware
 	include nagios::client
@@ -37,18 +36,23 @@ node default {
 	include unbound
 	include bacula::client
 	include autofs
-	include lvm
+	include dsa_lvm
+	include grub
 	include multipath
+	include popcon
+	include portforwarder
+	include postgres
+
 	if $::lsbdistcodename == squeeze {
-		include roles::udlap::client
+		include roles::udldap::client
 	} else {
 		include roles::pubsub::client
-		class { 'roles::udlap::client':
+		class { 'roles::udldap::client':
 			ensure => absent
 		}
 	}
 
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,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] {
+	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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] {
 		include ganeti2
 	}
 
@@ -64,15 +68,13 @@ node default {
 		}
 	}
 
-	if $::hostname == 'backuphost' {
+	if $::hostname == 'storace' {
 		include bacula::storage
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -97,45 +99,27 @@ node default {
 		include named::geodns
 	}
 
-	if $::hostname in [diabelli,nono] {
-		include dacs
-	}
-
-	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}
 
-	if $::hostname == 'vieuxtemps' {
-		include varnish
-	}
-
 	if $::brokenhosts {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
-	}
-
 	if $::samhain {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
-	}
-
-	if ($::postgres) {
-		include postgres
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }